diff --git a/src/global_commands.c b/src/global_commands.c
index d6c488d..fcd3d4e 100644
--- a/src/global_commands.c
+++ b/src/global_commands.c
@@ -294,7 +294,7 @@ void cmd_prompt_help(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*a
 
     wattron(window, COLOR_PAIR(CYAN) | A_BOLD);
     wprintw(window, " * Argument messages must be enclosed in quotation marks.\n");
-    wprintw(window, " * Use TAB and Shift-TAB to navigate through the tabs.\n\n");
+    wprintw(window, " * Use ctrl-o and ctrl-p to navigate through the tabs.\n\n");
     wattroff(window, COLOR_PAIR(CYAN) | A_BOLD);
 }
 
diff --git a/src/toxic_windows b/src/toxic_windows
index 7e1ad30..3b94f41 100644
Binary files a/src/toxic_windows and b/src/toxic_windows differ
diff --git a/src/toxic_windows.h b/src/toxic_windows.h
index c17c128..bc1bc2d 100644
--- a/src/toxic_windows.h
+++ b/src/toxic_windows.h
@@ -32,8 +32,8 @@
 /* ASCII key codes */
 #define T_KEY_KILL       0xB      /* ctrl-k */
 #define T_KEY_DISCARD    0x15     /* ctrl-u */
-#define T_KEY_NEXT       0x1D     /* ctrl-] */
-#define T_KEY_PREV       0x1B     /* ctrl-[ */
+#define T_KEY_NEXT       0x10     /* ctrl-] */
+#define T_KEY_PREV       0x0f     /* ctrl-[ */
 
 /* Curses foreground colours (background is black) */
 enum {
diff --git a/src/windows.c b/src/windows.c
index 13c154d..ef0877c 100644
--- a/src/windows.c
+++ b/src/windows.c
@@ -215,7 +215,7 @@ void del_window(ToxWindow *w)
 }
 
 /* Shows next window when tab or back-tab is pressed */
-void set_next_window(int ch)
+void set_next_window(wint_t ch)
 {
     ToxWindow *end = windows + MAX_WINDOWS_NUM - 1;
     ToxWindow *inf = active_window;
@@ -349,7 +349,7 @@ void draw_active_window(Tox *m)
 #endif
 
     if (ch == '\t' || ch == KEY_BTAB || ch == T_KEY_NEXT || ch == T_KEY_PREV)
-        set_next_window((int) ch);
+        set_next_window(ch);
     else if (ch != ERR)
         a->onKey(a, m, ch);
 }