diff --git a/panels/search/cc-search-panel-row.ui b/panels/search/cc-search-panel-row.ui
index 1cb76aede..dc53aad05 100644
--- a/panels/search/cc-search-panel-row.ui
+++ b/panels/search/cc-search-panel-row.ui
@@ -57,7 +57,7 @@
             <child>
               <object class="GtkMenuButton">
                 <property name="visible">True</property>
-                <property name="can-focus">False</property>
+                <property name="can-focus">True</property>
                 <property name="popover">move_row_menu</property>
                 <style>
                   <class name="flat"/>
diff --git a/panels/search/cc-search-panel.ui b/panels/search/cc-search-panel.ui
index f046ab560..59a734efd 100644
--- a/panels/search/cc-search-panel.ui
+++ b/panels/search/cc-search-panel.ui
@@ -3,12 +3,13 @@
   <!-- interface-requires gtk+ 3.0 -->
   <template class="CcSearchPanel" parent="CcPanel">
     <property name="visible">True</property>
-    <property name="can_focus">True</property>
+    <property name="can_focus">False</property>
 
     <child>
       <object class="GtkScrolledWindow" id="search_vbox">
         <property name="visible">True</property>
         <property name="hscrollbar_policy">never</property>
+        <property name="can_focus">False</property>
         <child>
           <object class="HdyColumn">
             <property name="visible">True</property>