diff --git a/src/game.cpp b/src/game.cpp
index 4ff26087fa205..9f390fd5d1d1c 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -5577,8 +5577,7 @@ void game::control_vehicle()
                     } else {
                         return;
                     }
-                }
-                if( weapon->is_two_handed( u ) ) {
+                } else if( weapon->is_two_handed( u ) ) {
                     if( query_yn(
                             _( "You can't drive because you have to wield a %s with both hands.\n\nPut it away?" ),
                             weapon->tname() ) ) {