diff --git a/src/qml/Base/HSwipeView.qml b/src/qml/Base/HSwipeView.qml
index 62d872d6..e9bfd84f 100644
--- a/src/qml/Base/HSwipeView.qml
+++ b/src/qml/Base/HSwipeView.qml
@@ -3,6 +3,7 @@ import QtQuick.Controls 2.12
 
 SwipeView {
     Component.onCompleted: if (! changed) {
+        if (becomeKeyboardTabsTarget) shortcuts.tabsTarget = this
         setCurrentIndex(window.getState(this, "currentIndex", defaultIndex))
         saveEnabled = true
     }
@@ -17,6 +18,7 @@ SwipeView {
     // Prevent onCurrentIndexChanged from running before Component.onCompleted
     property bool saveEnabled: false
 
+    property bool becomeKeyboardTabsTarget: true
     property int defaultIndex: 0
     property bool changed: currentIndex !== defaultIndex
 
diff --git a/src/qml/Shortcuts.qml b/src/qml/Shortcuts.qml
index d462cb26..8c99ee4e 100644
--- a/src/qml/Shortcuts.qml
+++ b/src/qml/Shortcuts.qml
@@ -9,8 +9,8 @@ Item {
     // Flickable or ListView that should be affected by scroll shortcuts
     property Item flickTarget
 
-    // TabBar that should be affected by tab navigation shortcuts
-    property TabBar tabsTarget
+    // A QQC Container that should be affected by tab navigation shortcuts
+    property Container tabsTarget
 
     // DebugConsole that should be affected by console shortcuts
     property DebugConsole debugConsole