1 files changed, 2 insertions, 2 deletions

diff --git a/src/CurrentWindowCmd.cc b/src/CurrentWindowCmd.cc
index dc27056..e4de9a4 100644
--- a/src/CurrentWindowCmd.cc
+++ b/src/CurrentWindowCmd.cc
@@ -85,12 +85,12 @@ void TakeToPrevWorkspaceCmd::real_execute() {
 }
 
 void GoToTabCmd::real_execute() {
-    if (fbwindow().numClients() <= 1 || m_tab_num > fbwindow().numClients())
+    int num = m_tab_num + (m_tab_num > 0 ? 0 : fbwindow().numClients() + 1);
+    if (num < 1 || num > fbwindow().numClients())
         return;
 
     FluxboxWindow::ClientList::iterator it = fbwindow().clientList().begin();
 
-    int num = m_tab_num;
     while (--num > 0) ++it;
 
     fbwindow().setCurrentClient(**it, true);