diff --git a/Content.Client/Verbs/UI/VerbMenuUIController.cs b/Content.Client/Verbs/UI/VerbMenuUIController.cs
index 1bbf44ac2c..ad120da80b 100644
--- a/Content.Client/Verbs/UI/VerbMenuUIController.cs
+++ b/Content.Client/Verbs/UI/VerbMenuUIController.cs
@@ -60,13 +60,18 @@ namespace Content.Client.Verbs.UI
 
         public void OnStateEntered(MappingState state)
         {
+            _context.OnContextKeyEvent += OnKeyBindDown;
+            _context.OnContextClosed += Close;
             _verbSystem.OnVerbsResponse += HandleVerbsResponse;
         }
 
         public void OnStateExited(MappingState state)
         {
+            _context.OnContextKeyEvent -= OnKeyBindDown;
+            _context.OnContextClosed -= Close;
             if (_verbSystem != null)
                 _verbSystem.OnVerbsResponse -= HandleVerbsResponse;
+            Close();
         }
 
         /// <summary>