diff --git a/src/Dialogs/PreferenceWidgets/KeyboardShortcutsWidget.cpp b/src/Dialogs/PreferenceWidgets/KeyboardShortcutsWidget.cpp
index 8455ada0f7..b8ec36566f 100644
--- a/src/Dialogs/PreferenceWidgets/KeyboardShortcutsWidget.cpp
+++ b/src/Dialogs/PreferenceWidgets/KeyboardShortcutsWidget.cpp
@@ -293,7 +293,13 @@ void KeyboardShortcutsWidget::handleKeyEvent(QKeyEvent *event)
         if (nextKey == Qt::Key_Tab || nextKey == Qt::Key_Backtab) {
             QWidget * upnext = nullptr;
             if (nextKey == Qt::Key_Tab) {
-                upnext = nextInFocusChain();
+                if (ui.assignButton->isEnabled()) {
+                    upnext = ui.assignButton;
+                } else if (ui.removeButton->isEnabled()) {
+                    upnext = ui.removeButton;
+                } else {
+                    upnext = nextInFocusChain();
+                }
             } else {
                 upnext = previousInFocusChain();
             }