diff --git a/plugins/search.cpp b/plugins/search.cpp
index a177665ad..80dcc0f61 100644
--- a/plugins/search.cpp
+++ b/plugins/search.cpp
@@ -1160,6 +1160,9 @@ private:
             if (!in_entry_mode())
             {
                 // Changing screens, reset search
+                int32_t *cursor_pos = get_viewscreen_cursor();
+                if (cursor_pos && *cursor_pos < 0)
+                    *cursor_pos = 0;
                 clear_search();
                 reset_all();
             }