diff --git a/src/toolkit.c b/src/toolkit.c
index 732e623..6a492ce 100644
--- a/src/toolkit.c
+++ b/src/toolkit.c
@@ -1314,9 +1314,9 @@ void toolkit_update(void) {
 static void toolkit_nextFocus(void) {
   Window* wdw = &windows[nwindows-1]; /* Get active window. */
 
-  if(wdw->nwidgets==0)
+  if(wdw->nwidgets==0) /* Special case no widgets. */
     wdw->focus = -1;
-  else if(wdw->focus >= wdw->nwidgets)
+  else if(wdw->focus+1 >= wdw->nwidgets)
     wdw->focus = -1;
   else if((++wdw->focus+1) && /* Just increment. */
           toolkit_isFocusable(&wdw->widgets[wdw->focus]))