diff --git a/Amalgam/src/Features/Binds/Binds.cpp b/Amalgam/src/Features/Binds/Binds.cpp
index 64c7fe33..4f215473 100644
--- a/Amalgam/src/Features/Binds/Binds.cpp
+++ b/Amalgam/src/Features/Binds/Binds.cpp
@@ -64,14 +64,18 @@ void CBinds::Run(CTFPlayer* pLocal, CTFWeaponBase* pWeapon)
 					const bool bShouldUse = !I::EngineVGui->IsGameUIVisible() && !I::MatSystemSurface->IsCursorVisible()
 											|| F::Menu.IsOpen && !ImGui::GetIO().WantTextInput && !F::Menu.InKeybind; // allow in menu
 					bKey = bShouldUse && bKey;
-					if (tBind.Not)
-						bKey = !bKey;
 
 					switch (tBind.Info)
 					{
-					case 0: tBind.Active = bKey; break;
+					case 0:
+						if (tBind.Not)
+							bKey = !bKey;
+						tBind.Active = bKey;
+						break;
 					case 1:
-					case 2: if (bKey) tBind.Active = !tBind.Active;
+					case 2:
+						if (bKey)
+							tBind.Active = !tBind.Active;
 					}
 					break;
 				}
diff --git a/Amalgam/src/Features/ImGui/Menu/Components.h b/Amalgam/src/Features/ImGui/Menu/Components.h
index c3f9b0d9..dabaa73e 100644
--- a/Amalgam/src/Features/ImGui/Menu/Components.h
+++ b/Amalgam/src/Features/ImGui/Menu/Components.h
@@ -1598,7 +1598,7 @@ namespace ImGui
 				int iKeyPressed = 0;
 				for (short iKey = 0; iKey < 255; iKey++)
 				{
-					if (U::KeyHandler.Pressed(iKey) && iKey != VK_LBUTTON)
+					if (U::KeyHandler.Pressed(iKey))
 					{
 						iKeyPressed = iKey;
 						break;