diff --git a/modules/corelib/ui/uimovabletabbar.lua b/modules/corelib/ui/uimovabletabbar.lua
index 33298ec8..b60a1c77 100644
--- a/modules/corelib/ui/uimovabletabbar.lua
+++ b/modules/corelib/ui/uimovabletabbar.lua
@@ -389,8 +389,16 @@ function UIMoveableTabBar:selectNextTab()
     if #self.postTabs > 0 then
       local widget = showPostTab(self)
       self:selectTab(widget)
-      updateTabs(self)
+    else
+      if #self.preTabs > 0 then
+        for i = 1, #self.preTabs do
+          showPreTab(self)
+        end
+      end
+
+      self:selectTab(self.tabs[1])
     end
+    updateTabs(self)
     return
   end
 
@@ -417,8 +425,16 @@ function UIMoveableTabBar:selectPrevTab()
     if #self.preTabs > 0 then
       local widget = showPreTab(self)
       self:selectTab(widget)
-      updateTabs(self)
+    else
+      if #self.postTabs > 0 then
+        for i = 1, #self.postTabs do
+          showPostTab(self)
+        end
+      end
+
+      self:selectTab(self.tabs[#self.tabs])
     end
+    updateTabs(self)
     return
   end
 
@@ -461,4 +477,4 @@ function UIMoveableTabBar:setNavigation(prevButton, nextButton)
     nextNavigation.onClick = function() self:selectNextTab() end
   end
   updateNavigation(self)
-end
\ No newline at end of file
+end