diff --git a/lookandfeel/contents/runcommand/RunCommand.qml b/lookandfeel/contents/runcommand/RunCommand.qml
--- a/lookandfeel/contents/runcommand/RunCommand.qml
+++ b/lookandfeel/contents/runcommand/RunCommand.qml
@@ -100,16 +100,18 @@
                 if (length === 0) {
                     root.showHistory = true;
                     listView.forceActiveFocus();
-                } else {
+                } else if (results.count > 0) {
                     results.forceActiveFocus();
+                    results.decrementCurrentIndex();
                 }
             }
             Keys.onDownPressed: {
                 if (length === 0) {
                     root.showHistory = true;
                     listView.forceActiveFocus();
-                } else {
+                } else if (results.count > 0) {
                     results.forceActiveFocus();
+                    results.incrementCurrentIndex();
                 }
             }
             Keys.onEnterPressed: results.runCurrentIndex()