diff --git a/assets/panel/debugger.properties b/assets/panel/debugger.properties
index 73dc6aac46..f9c9cc0763 100644
--- a/assets/panel/debugger.properties
+++ b/assets/panel/debugger.properties
@@ -592,6 +592,10 @@ symbolSearch.search.variablesPlaceholder=Search variables…
 # searching for a function or variable
 symbolSearch.search.key2=CmdOrCtrl+Shift+O
 
+# LOCALIZATION NOTE(symbolSearch.searchModifier.modifiersLabel): A label
+# preceding the group of modifiers
+symbolSearch.searchModifier.modifiersLabel=Modifiers:
+
 # LOCALIZATION NOTE(symbolSearch.searchModifier.regex): A search option
 # when searching text in a file
 symbolSearch.searchModifier.regex=Regex
diff --git a/src/components/Editor/SearchBar.css b/src/components/Editor/SearchBar.css
index f2f60f5698..540678e2e5 100644
--- a/src/components/Editor/SearchBar.css
+++ b/src/components/Editor/SearchBar.css
@@ -61,11 +61,8 @@
   width: 16px;
 }
 
-.search-bottom-bar .search-modifiers button svg:hover {
-  cursor: pointer;
-}
-
 .search-bottom-bar .search-modifiers button:hover {
+  cursor: pointer;
   background: var(--theme-toolbar-background-hover);
 }
 
@@ -87,23 +84,18 @@
   max-width: 68%;
 }
 
-.search-bottom-bar .search-type-toggles .search-toggle-title {
-  color: var(--theme-body-color-inactive);
-  font-size: 11px;
-  font-weight: normal;
-  margin: 0;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  overflow: hidden;
-}
-
-.search-bottom-bar .search-type-toggles .search-type-btn {
+.search-bottom-bar .search-type-name {
+  padding: 1px 0 0 0;
   margin: 0 0 0 6px;
   border: none;
   background: transparent;
   color: var(--theme-comment-alt);
 }
 
+.search-bottom-bar .search-type-toggles .search-type-name:hover {
+  cursor: pointer;
+}
+
 .search-bottom-bar .search-type-toggles .search-type-btn:hover {
   cursor: pointer;
 }
diff --git a/src/components/Editor/SearchBar.js b/src/components/Editor/SearchBar.js
index 8a1e4e61d5..4ffe66a01a 100644
--- a/src/components/Editor/SearchBar.js
+++ b/src/components/Editor/SearchBar.js
@@ -358,6 +358,9 @@ class SearchBar extends Component {
 
     return (
       <div className="search-modifiers">
+        <span className="search-type-name">
+          {L10N.getStr("symbolSearch.searchModifier.modifiersLabel")}
+        </span>
         <SearchModBtn
           modVal="regexMatch"
           className="regex-match-btn"
@@ -380,6 +383,19 @@ class SearchBar extends Component {
     );
   }
 
+  renderSearchType() {
+    return (
+      <div className="search-type-toggles">
+        <span
+          className="search-type-name"
+          onClick={() => this.props.setActiveSearch("symbol")}
+        >
+          {L10N.getStr("symbolSearch.search.functionsPlaceholder")}
+        </span>
+      </div>
+    );
+  }
+
   render() {
     const { searchResults: { count }, query, searchOn } = this.props;
 
@@ -401,6 +417,7 @@ class SearchBar extends Component {
           handleClose={this.closeSearch}
         />
         <div className="search-bottom-bar">
+          {this.renderSearchType()}
           {this.renderSearchModifiers()}
         </div>
       </div>
diff --git a/src/components/Editor/tests/__snapshots__/SearchBar.js.snap b/src/components/Editor/tests/__snapshots__/SearchBar.js.snap
index 3dbb9a32d1..bb725f976a 100644
--- a/src/components/Editor/tests/__snapshots__/SearchBar.js.snap
+++ b/src/components/Editor/tests/__snapshots__/SearchBar.js.snap
@@ -27,9 +27,24 @@ ShallowWrapper {
     <div
         className="search-bottom-bar"
     >
+        <div
+            className="search-type-toggles"
+        >
+            <span
+                className="search-type-name"
+                onClick={[Function]}
+            >
+                Search functions…
+            </span>
+        </div>
         <div
             className="search-modifiers"
         >
+            <span
+                className="search-type-name"
+            >
+                Modifiers:
+            </span>
             <SearchModBtn
                 className="regex-match-btn"
                 modVal="regexMatch"
@@ -71,9 +86,24 @@ ShallowWrapper {
       <div
             className="search-bottom-bar"
       >
+            <div
+                  className="search-type-toggles"
+            >
+                  <span
+                        className="search-type-name"
+                        onClick={[Function]}
+                  >
+                        Search functions…
+                  </span>
+            </div>
             <div
                   className="search-modifiers"
             >
+                  <span
+                        className="search-type-name"
+                  >
+                        Modifiers:
+                  </span>
                   <SearchModBtn
                         className="regex-match-btn"
                         modVal="regexMatch"
@@ -209,9 +239,24 @@ ShallowWrapper {
           <div
                     className="search-bottom-bar"
           >
+                    <div
+                              className="search-type-toggles"
+                    >
+                              <span
+                                        className="search-type-name"
+                                        onClick={[Function]}
+                              >
+                                        Search functions…
+                              </span>
+                    </div>
                     <div
                               className="search-modifiers"
                     >
+                              <span
+                                        className="search-type-name"
+                              >
+                                        Modifiers:
+                              </span>
                               <SearchModBtn
                                         className="regex-match-btn"
                                         modVal="regexMatch"
@@ -253,9 +298,24 @@ ShallowWrapper {
           <div
                     className="search-bottom-bar"
           >
+                    <div
+                              className="search-type-toggles"
+                    >
+                              <span
+                                        className="search-type-name"
+                                        onClick={[Function]}
+                              >
+                                        Search functions…
+                              </span>
+                    </div>
                     <div
                               className="search-modifiers"
                     >
+                              <span
+                                        className="search-type-name"
+                              >
+                                        Modifiers:
+                              </span>
                               <SearchModBtn
                                         className="regex-match-btn"
                                         modVal="regexMatch"