diff --git a/src/library/autodj/dlgautodj.cpp b/src/library/autodj/dlgautodj.cpp
index 4104dc72c1c6..666f30307869 100644
--- a/src/library/autodj/dlgautodj.cpp
+++ b/src/library/autodj/dlgautodj.cpp
@@ -167,7 +167,8 @@ DlgAutoDJ::DlgAutoDJ(WLibrary* parent,
     connect(lineEditTransition,
             &QLineEdit::returnPressed,
             this,
-            &DlgAutoDJ::shiftTabKeypress);
+            // Move focus to tracks table to immediately allow keyboard shortcuts again.
+            &DlgAutoDJ::setFocus);
 
     connect(spinBoxTransition,
             QOverload<int>::of(&QSpinBox::valueChanged),
@@ -341,7 +342,8 @@ void DlgAutoDJ::slotTransitionModeChanged(int newIndex) {
     m_pAutoDJProcessor->setTransitionMode(
             static_cast<AutoDJProcessor::TransitionMode>(
                     fadeModeCombobox->itemData(newIndex).toInt()));
-    shiftTabKeypress();
+    // Move focus to tracks table to immediately allow keyboard shortcuts again.
+    setFocus();
 }
 
 void DlgAutoDJ::slotRepeatPlaylistChanged(int checkState) {
@@ -380,15 +382,6 @@ bool DlgAutoDJ::hasFocus() const {
     return m_pTrackTableView->hasFocus();
 }
 
-void DlgAutoDJ::shiftTabKeypress() {
-    // After selecting a mode or editing the transition time, send Shift+Tab
-    // to move focus to the next keyboard-focusable widget (tracks table in
-    // official skins) in order to immediately allow keyboard shortcuts again.
-    QKeyEvent backwardFocusKeyEvent =
-            QKeyEvent{QEvent::KeyPress, Qt::Key_Tab, Qt::ShiftModifier};
-    QApplication::sendEvent(this, &backwardFocusKeyEvent);
-}
-
 void DlgAutoDJ::setFocus() {
     m_pTrackTableView->setFocus();
 }
diff --git a/src/library/autodj/dlgautodj.h b/src/library/autodj/dlgautodj.h
index cbe92c099dd1..05933ae0e23a 100644
--- a/src/library/autodj/dlgautodj.h
+++ b/src/library/autodj/dlgautodj.h
@@ -57,7 +57,6 @@ class DlgAutoDJ : public QWidget, public Ui::DlgAutoDJ, public LibraryView {
     void setupActionButton(QPushButton* pButton,
             void (DlgAutoDJ::*pSlot)(bool),
             const QString& fallbackText);
-    void shiftTabKeypress();
 
     const UserSettingsPointer m_pConfig;