diff --git a/src/Internal/Update.elm b/src/Internal/Update.elm
index c63fc22..eb850ac 100644
--- a/src/Internal/Update.elm
+++ b/src/Internal/Update.elm
@@ -206,7 +206,7 @@ handleKey selectOnTab tagger model key filteredOptions =
             ( Model.closeMenu model, Effect.none )
 
         "Tab" ->
-            if selectOnTab then
+            if selectOnTab && Model.toValue model == Nothing then
                 selectHighlighted
 
             else