keyboard navigation in search window

3 files changed, 12 insertions, 6 deletions

diff --git a/plugins/gtkui/callbacks.c b/plugins/gtkui/callbacks.c
index 8be9021f..8d82b8c4 100644
--- a/plugins/gtkui/callbacks.c
+++ b/plugins/gtkui/callbacks.c
@@ -611,7 +611,14 @@ on_mainwin_key_press_event             (GtkWidget       *widget,
                                         GdkEventKey     *event,
                                         gpointer         user_data)
 {
-    gtkpl_keypress (&main_playlist, event->keyval, event->state);
+
+    if (event->keyval == GDK_n) {
+        // button for that one is not in toolbar anymore, so handle it manually
+        deadbeef->sendmessage (M_PLAYRANDOM, 0, 0, 0);
+    }
+    else {
+        gtkpl_keypress (&main_playlist, event->keyval, event->state);
+    }
     return FALSE;
 }
 
diff --git a/plugins/gtkui/gtkplaylist.c b/plugins/gtkui/gtkplaylist.c
index 4a112107..bf2a6e18 100644
--- a/plugins/gtkui/gtkplaylist.c
+++ b/plugins/gtkui/gtkplaylist.c
@@ -891,11 +891,7 @@ gtkpl_keypress (gtkplaylist_t *ps, int keyval, int state) {
     GtkWidget *range = ps->scrollbar;
     int prev = deadbeef->pl_get_cursor (ps->iterator);
     int newscroll = ps->scrollpos;
-    if (keyval == GDK_n) {
-        // button for that one is not in toolbar anymore, so handle it manually
-        deadbeef->sendmessage (M_PLAYRANDOM, 0, 0, 0);
-    }
-    else if (keyval == GDK_Down) {
+    if (keyval == GDK_Down) {
         int cursor = deadbeef->pl_get_cursor (ps->iterator);
         if (cursor < ps->get_count () - 1) {
             gtkpl_set_cursor (ps->iterator, cursor+1);
diff --git a/plugins/gtkui/search.c b/plugins/gtkui/search.c
index 07629f71..55b5ad3f 100644
--- a/plugins/gtkui/search.c
+++ b/plugins/gtkui/search.c
@@ -168,6 +168,9 @@ on_searchwin_key_press_event           (GtkWidget       *widget,
             }
         }
     }
+    else {
+        gtkpl_keypress (&search_playlist, event->keyval, event->state);
+    }
     return FALSE;
 }