diff --git a/src/musikbox/Main.cpp b/src/musikbox/Main.cpp
index 556c08b7e..b6d24649b 100644
--- a/src/musikbox/Main.cpp
+++ b/src/musikbox/Main.cpp
@@ -176,8 +176,7 @@ static inline std::string readKeyPress(int64 ch) {
         kn += (char)getch();
     }
 
-
-    //std::cerr << "keyname: " << kn << std::endl;
+    // std::cerr << "keyname: " << kn << std::endl;
     // std::cerr << "ch: " << ch << std::endl;
 
     return kn;
@@ -293,10 +292,10 @@ int main(int argc, char* argv[])
                 else if (kn == "KEY_RESIZE") {
                     resizeAt = now() + REDRAW_DEBOUNCE_MS;
                 }
-                else if (ch == KEY_F(1)) {
+                else if (ch == KEY_F(1) || kn == "M-q") {
                     changeLayout(state, consoleLayout);
                 }
-                else if (ch == KEY_F(2)) {
+                else if (ch == KEY_F(2) || kn == "M-w") {
                     changeLayout(state, libraryLayout);
                 }
                 else if (!globalHotkeys.Handle(kn)) {
diff --git a/src/musikbox/app/window/CommandWindow.cpp b/src/musikbox/app/window/CommandWindow.cpp
index 5ea7bd8ed..1e8dc001f 100755
--- a/src/musikbox/app/window/CommandWindow.cpp
+++ b/src/musikbox/app/window/CommandWindow.cpp
@@ -81,7 +81,7 @@ void removeUtf8Char(std::string& value) {
 }
 
 void CommandWindow::Write(const std::string& key) {
-    if (key == "^H" || key == "^?") { /* backspace */
+    if (key == "^H" || key == "^?" || key == "KEY_BACKSPACE") { /* backspace */
         removeUtf8Char(this->buffer);
     }
     else if (key == "^M") { /* return */