diff --git a/src/search-popover.ui b/src/search-popover.ui
index e031182b..4b5d8ab3 100644
--- a/src/search-popover.ui
+++ b/src/search-popover.ui
@@ -46,6 +46,7 @@
                   <object class="GtkButton" id="search_prev_button">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="can_default">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">Search for previous occurrence</property>
                     <property name="focus_on_click">False</property>
@@ -68,7 +69,6 @@
                   <object class="GtkButton" id="search_next_button">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
-                    <property name="can_default">True</property>
                     <property name="receives_default">True</property>
                     <property name="tooltip_text" translatable="yes">Search for next occurrence</property>
                     <property name="focus_on_click">False</property>
diff --git a/src/terminal-search-popover.c b/src/terminal-search-popover.c
index 1fde569d..4583a4f0 100644
--- a/src/terminal-search-popover.c
+++ b/src/terminal-search-popover.c
@@ -367,10 +367,10 @@ terminal_search_popover_init (TerminalSearchPopover *popover)
 
 #if 0 // GTK_CHECK_VERSION (3, 17, 2)
   G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-  gtk_popover_set_default_widget (GTK_POPOVER (popover), priv->search_next_button);
+  gtk_popover_set_default_widget (GTK_POPOVER (popover), priv->search_prev_button);
   G_GNUC_END_IGNORE_DEPRECATIONS
 #else
-  gtk_window_set_default (GTK_WINDOW (popover), priv->search_next_button);
+  gtk_window_set_default (GTK_WINDOW (popover), priv->search_prev_button);
 #endif
 
 #if GTK_CHECK_VERSION (3, 16, 0)
