diff --git a/src/libide/editor/ide-editor-search-bar.c b/src/libide/editor/ide-editor-search-bar.c
index 6142085032b079bc99f7af3810ce3def4bc4d992..b27499bc35a9213c47d984c04d55b38606bd43eb 100644
--- a/src/libide/editor/ide-editor-search-bar.c
+++ b/src/libide/editor/ide-editor-search-bar.c
@@ -233,7 +233,7 @@ search_entry_previous_match (IdeEditorSearchBar *self,
     {
       ide_editor_search_set_extend_selection (self->search, IDE_EDITOR_SEARCH_SELECT_NONE);
       ide_editor_search_set_repeat (self->search, 0);
-      ide_editor_search_move (self->search, IDE_EDITOR_SEARCH_BACKWARD);
+      ide_editor_search_move (self->search, IDE_EDITOR_SEARCH_PREVIOUS);
     }
 }
 
@@ -248,7 +248,7 @@ search_entry_next_match (IdeEditorSearchBar *self,
     {
       ide_editor_search_set_extend_selection (self->search, IDE_EDITOR_SEARCH_SELECT_NONE);
       ide_editor_search_set_repeat (self->search, 0);
-      ide_editor_search_move (self->search, IDE_EDITOR_SEARCH_FORWARD);
+      ide_editor_search_move (self->search, IDE_EDITOR_SEARCH_NEXT);
     }
 }
 
diff --git a/src/plugins/grep/gbp-grep-panel.c b/src/plugins/grep/gbp-grep-panel.c
index e2839f0a8da97e7ee3394db2fbe5c00470bf9c1e..16b781f6037b8d5fddf823ac08bb3e213d11d7e0 100644
--- a/src/plugins/grep/gbp-grep-panel.c
+++ b/src/plugins/grep/gbp-grep-panel.c
@@ -482,6 +482,8 @@ gbp_grep_panel_launch_search (GbpGrepPanel *self)
   gtk_stack_set_visible_child (self->stack, GTK_WIDGET (self->spinner));
   gtk_spinner_start (self->spinner);
   gtk_widget_set_sensitive (GTK_WIDGET (self->find_button), FALSE);
+  gtk_widget_set_sensitive (GTK_WIDGET (self->replace_button), FALSE);
+  gtk_widget_set_sensitive (GTK_WIDGET (self->replace_entry), FALSE);
 
   ide_widget_reveal_and_grab (GTK_WIDGET (self));