diff --git a/CHANGES.md b/CHANGES.md
index 6248bac9c1..7549161cff 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -39,6 +39,10 @@
     leave the window open and keep the keyboard grabbed. See issue
     [#180](https://github.com/xmonad/xmonad-contrib/issues/180).
 
+    Fixes [issue #217](https://github.com/xmonad/xmonad-contrib/issues/217), where
+    using tab to wrap around the completion rows would fail when maxComplRows is
+    restricting the number of rows of output.
+
 ## 0.15
 
 ### Breaking Changes
diff --git a/XMonad/Prompt.hs b/XMonad/Prompt.hs
index eb8d4c21ce..88fedfe9fc 100644
--- a/XMonad/Prompt.hs
+++ b/XMonad/Prompt.hs
@@ -852,8 +852,8 @@ bufferOne xs x = (null xs && null x,True)
 nextComplIndex :: XPState -> Int -> (Int,Int)
 nextComplIndex st nitems = case complWinDim st of
   Nothing -> (0,0) --no window dims (just destroyed or not created)
-  Just (_,_,_,_,_,yy) -> let
-    (ncols,nrows) = (nitems `div` length yy + if (nitems `mod` length yy > 0) then 1 else 0, length yy)
+  Just (_,_,_,_,xx,yy) -> let
+    (ncols,nrows) = (length xx, length yy)
     (currentcol,currentrow) = complIndex st
     in if (currentcol + 1 >= ncols) then --hlight is in the last column
          if (currentrow + 1 < nrows ) then --hlight is still not at the last row