diff --git a/app/ui/main_app_window.py b/app/ui/main_app_window.py
index 968e31e8..9ba85660 100644
--- a/app/ui/main_app_window.py
+++ b/app/ui/main_app_window.py
@@ -95,7 +95,8 @@ class MainAppWindow:
                     "on_assign_picon": self.on_assign_picon,
                     "on_remove_picon": self.on_remove_picon,
                     "on_reference_picon": self.on_reference_picon,
-                    "on_filter_toggled": self.on_filter_toggled}
+                    "on_filter_toggled": self.on_filter_toggled,
+                    "on_search_toggled": self.on_search_toggled}
 
         self.__options = get_config()
         self.__profile = self.__options.get("profile")
@@ -135,6 +136,7 @@ class MainAppWindow:
         self.__radio_count_label = builder.get_object("radio_count_label")
         self.__data_count_label = builder.get_object("data_count_label")
         self.__fav_edit_marker_popup_item = builder.get_object("fav_edit_marker_popup_item")
+        self.__search_info_bar = builder.get_object("search_info_bar")
         # Filter
         self.__services_model_filter = builder.get_object("services_model_filter")
         self.__services_model_filter.set_visible_func(self.services_filter_function)
@@ -696,8 +698,6 @@ class MainAppWindow:
             self.on_hide(None)
         elif ctrl and key == Gdk.KEY_E or key == Gdk.KEY_e or key == Gdk.KEY_F2:
             self.on_edit(view)
-        elif key == Gdk.KEY_space and model_name == self._FAV_LIST_NAME:
-            pass
         elif key == Gdk.KEY_Left or key == Gdk.KEY_Right:
             view.do_unselect_all(view)
 
@@ -836,6 +836,7 @@ class MainAppWindow:
         dialog.show()
         self.update_picons()
 
+    @run_idle
     def on_filter_toggled(self, toggle_button: Gtk.ToggleToolButton):
         self.__filter_info_bar.set_visible(toggle_button.get_active())
 
@@ -849,6 +850,9 @@ class MainAppWindow:
         else:
             return self.__filter_entry.get_text() in str(model.get(iter, 3, 6, 7, 10, 11, 12, 13, 14, 15, 16))
 
+    def on_search_toggled(self, toggle_button: Gtk.ToggleToolButton):
+        self.__search_info_bar.set_visible(toggle_button.get_active())
+
     @run_idle
     def update_picons(self):
         update_picons(self.__options.get(self.__profile).get("picons_dir_path"), self.__picons, self.__services_model)
diff --git a/app/ui/main_window.glade b/app/ui/main_window.glade
index 9a1105b4..86d1047d 100644
--- a/app/ui/main_window.glade
+++ b/app/ui/main_window.glade
@@ -793,7 +793,7 @@
                 <property name="tooltip_text" translatable="yes">Services filter</property>
                 <property name="label" translatable="yes">Services filter</property>
                 <property name="use_underline">True</property>
-                <property name="stock_id">gtk-find</property>
+                <property name="icon_name">tools-check-spelling</property>
                 <signal name="toggled" handler="on_filter_toggled" swapped="no"/>
               </object>
               <packing>
@@ -801,6 +801,20 @@
                 <property name="homogeneous">True</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkToggleToolButton" id="search_tool_button">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Search</property>
+                <property name="use_underline">True</property>
+                <property name="stock_id">gtk-find</property>
+                <signal name="toggled" handler="on_search_toggled" swapped="no"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="homogeneous">True</property>
+              </packing>
+            </child>
             <child>
               <object class="GtkSeparatorToolItem" id="toolbutton4">
                 <property name="visible">True</property>
@@ -1138,6 +1152,97 @@
             <property name="position">1</property>
           </packing>
         </child>
+        <child>
+          <object class="GtkInfoBar" id="search_info_bar">
+            <property name="app_paintable">True</property>
+            <property name="can_focus">False</property>
+            <property name="homogeneous">True</property>
+            <child internal-child="action_area">
+              <object class="GtkButtonBox" id="search_infobar_action_area">
+                <property name="can_focus">False</property>
+                <property name="spacing">6</property>
+                <property name="layout_style">end</property>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child internal-child="content_area">
+              <object class="GtkBox" id="search_infobar_content_area">
+                <property name="can_focus">False</property>
+                <property name="spacing">16</property>
+                <property name="homogeneous">True</property>
+                <child>
+                  <object class="GtkAlignment" id="alignment1">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <child>
+                      <placeholder/>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkSearchEntry" id="search_entry">
+                    <property name="visible">True</property>
+                    <property name="sensitive">False</property>
+                    <property name="can_focus">True</property>
+                    <property name="primary_icon_name">edit-find-symbolic</property>
+                    <property name="primary_icon_activatable">False</property>
+                    <property name="primary_icon_sensitive">False</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkAlignment" id="alignment2">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <child>
+                      <placeholder/>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
         <child>
           <object class="GtkSeparator" id="separator5">
             <property name="visible">True</property>
@@ -1493,6 +1598,7 @@
                   <object class="GtkInfoBar" id="filter_info_bar">
                     <property name="app_paintable">True</property>
                     <property name="can_focus">False</property>
+                    <property name="margin_bottom">2</property>
                     <property name="spacing">2</property>
                     <child internal-child="action_area">
                       <object class="GtkButtonBox" id="filter_infobar_action_area">
@@ -1520,27 +1626,26 @@
                         <property name="can_focus">False</property>
                         <property name="spacing">16</property>
                         <child>
-                          <placeholder/>
-                        </child>
-                        <child>
-                          <object class="GtkEntry" id="filter_entry">
+                          <object class="GtkSearchEntry" id="filter_entry">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="tooltip_text" translatable="yes">Services filter</property>
-                            <property name="primary_icon_name">edit-select-all-symbolic</property>
+                            <property name="primary_icon_name">tools-check-spelling</property>
                             <property name="primary_icon_activatable">False</property>
-                            <property name="primary_icon_tooltip_text" translatable="yes">Services filter</property>
-                            <signal name="changed" handler="on_filter_changed" swapped="no"/>
+                            <property name="primary_icon_sensitive">False</property>
+                            <signal name="search-changed" handler="on_filter_changed" swapped="no"/>
                           </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">True</property>
-                            <property name="position">1</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
                           <placeholder/>
                         </child>
+                        <child>
+                          <placeholder/>
+                        </child>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -1554,7 +1659,7 @@
                   </object>
                   <packing>
                     <property name="expand">False</property>
-                    <property name="fill">True</property>
+                    <property name="fill">False</property>
                     <property name="position">2</property>
                   </packing>
                 </child>