diff --git a/src/dusk/ui/tab_bar.cpp b/src/dusk/ui/tab_bar.cpp
index 5d19d22b27..debc6bc992 100644
--- a/src/dusk/ui/tab_bar.cpp
+++ b/src/dusk/ui/tab_bar.cpp
@@ -169,7 +169,10 @@ bool TabBar::handle_nav_command(Rml::Event& event, NavCommand cmd) {
         cmd == NavCommand::Previous)
     {
         bool isNext = cmd == NavCommand::Right || cmd == NavCommand::Next;
-        int currentComponent = tab_containing(event.GetTargetElement());
+        int currentComponent = mProps.selectedTabIndex;
+        if (cmd == NavCommand::Left || cmd == NavCommand::Right) {
+            currentComponent = tab_containing(event.GetTargetElement());
+        }
         int direction = isNext ? 1 : -1;
         int i = currentComponent + direction;
         if (currentComponent == -1) {