diff --git a/src/musikbox/app/layout/SearchLayout.cpp b/src/musikbox/app/layout/SearchLayout.cpp
index 15af50e1c..fdbf886f6 100755
--- a/src/musikbox/app/layout/SearchLayout.cpp
+++ b/src/musikbox/app/layout/SearchLayout.cpp
@@ -176,8 +176,10 @@ bool SearchLayout::KeyPress(const std::string& key) {
     }
 
     if (key == "KEY_DOWN") {
-        this->FocusNext();
-        return true;
+        if (this->GetFocus() == this->input) {
+            this->FocusNext();
+            return true;
+        }
     }
     else if (key == "KEY_UP") {
         if (IS_CATEGORY(this->GetFocus())) {
diff --git a/src/musikbox/app/layout/TrackSearchLayout.cpp b/src/musikbox/app/layout/TrackSearchLayout.cpp
index 3bddce557..a3527811f 100755
--- a/src/musikbox/app/layout/TrackSearchLayout.cpp
+++ b/src/musikbox/app/layout/TrackSearchLayout.cpp
@@ -152,8 +152,10 @@ bool TrackSearchLayout::KeyPress(const std::string& key) {
         return true;
     }
     else if (key == "KEY_DOWN") {
-        this->FocusNext();
-        return true;
+        if (this->GetFocus() == this->input) {
+            this->FocusNext();
+            return true;
+        }
     }
     else if (key == "KEY_UP") {
         if (this->GetFocus() == this->trackList) {