diff --git a/data/ui/favorites-popover.ui b/data/ui/favorites-popover.ui
index 352084a476e0ad6eb9ae0959b5d7ebf9f81c9031..7ee1bbb69bc62630795fdba66fd6505b7f2e0c55 100644
--- a/data/ui/favorites-popover.ui
+++ b/data/ui/favorites-popover.ui
@@ -14,17 +14,12 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
+        <property name="row_spacing">6</property>
+        <property name="margin">6</property>
         <child>
-          <object class="GtkRevealer" id="revealer">
+          <object class="GtkEntry" id="entry">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <child>
-              <object class="GtkEntry" id="entry">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="margin">10</property>
-              </object>
-            </child>
+            <property name="can_focus">True</property>
           </object>
         </child>
         <child>
diff --git a/src/favoritesPopover.js b/src/favoritesPopover.js
index 3a0454ffe6b33f0c0e33ef5053b905412f87a32c..8386eaa031103a972676208db58d0774988e9006 100644
--- a/src/favoritesPopover.js
+++ b/src/favoritesPopover.js
@@ -30,7 +30,6 @@ const _N_VISIBLE = 6;
 var FavoritesPopover = GObject.registerClass({
     Template: 'resource:///org/gnome/Maps/ui/favorites-popover.ui',
     InternalChildren: [ 'mainGrid',
-                        'revealer',
                         'entry',
                         'scrolledWindow',
                         'list' ],
@@ -71,10 +70,10 @@ var FavoritesPopover = GObject.registerClass({
         this.connect('notify::rows', () => {
             let visible = Math.min(this._rows, _N_VISIBLE);
             let separators = visible - 1; // separators are 1px
-            let height = (PlaceListRow.ROW_HEIGHT + 6) * visible + separators;
+            let height = PlaceListRow.ROW_HEIGHT * visible + separators;
 
             this._scrolledWindow.min_content_height = height;
-            this._revealer.reveal_child = this._rows > _N_VISIBLE;
+            this._entry.visible = this._rows > _N_VISIBLE;
         });
 
         this._entry.connect('changed',