diff --git a/addons/sourcemod/scripting/shavit-tas.sp b/addons/sourcemod/scripting/shavit-tas.sp
index 5119f705..9554a061 100644
--- a/addons/sourcemod/scripting/shavit-tas.sp
+++ b/addons/sourcemod/scripting/shavit-tas.sp
@@ -462,10 +462,15 @@ void OpenTasSettingsMenu(int client)
 	bool tastype_editable = (tastype == TASType_Any);
 	tastype = (tastype == TASType_Any) ? gI_Type[client] : tastype;
 
-	FormatEx(display, sizeof(display), "%T: %T", "Autostrafer_type", client,
+	FormatEx(display, sizeof(display), "%T: %T\n ", "Autostrafer_type", client,
 		(tastype == TASType_1Tick ? "Autostrafer_1tick" : "Autostrafer_autogain"), client);
 	menu.AddItem("type", display, (tastype_editable ? ITEMDRAW_DEFAULT : ITEMDRAW_DISABLED));
 
+	TASOverride ov = gI_Override[client];
+	FormatEx(display, sizeof(display), "%T: %T", "TASOverride", client,
+		(ov == TASOverride_Normal ? "TASOverride_Normal" : (ov == TASOverride_Surf ? "TASOverride_Surf" : "TASOverride_All")), client);
+	menu.AddItem("override", display);
+
 	if (Shavit_GetStyleSettingBool(Shavit_GetBhopStyle(client), "segments"))
 	{
 		menu.ExitBackButton = true;
@@ -506,6 +511,21 @@ public int MenuHandler_TasSettings(Menu menu, MenuAction action, int param1, int
 				gI_Type[param1] = (gI_Type[param1] == TASType_1Tick ? TASType_Autogain : TASType_1Tick);
 			}
 		}
+		else if (StrEqual(info, "override"))
+		{
+			if (gI_Override[param1] == TASOverride_Normal)
+			{
+				gI_Override[param1] = TASOverride_Surf;
+			}
+			else if (gI_Override[param1] == TASOverride_Surf)
+			{
+				gI_Override[param1] = TASOverride_All;
+			}
+			else
+			{
+				gI_Override[param1] = TASOverride_Normal;
+			}
+		}
 
 		OpenTasSettingsMenu(param1);
 	}
diff --git a/addons/sourcemod/translations/shavit-misc.phrases.txt b/addons/sourcemod/translations/shavit-misc.phrases.txt
index 01f69f78..b1b5476c 100644
--- a/addons/sourcemod/translations/shavit-misc.phrases.txt
+++ b/addons/sourcemod/translations/shavit-misc.phrases.txt
@@ -216,6 +216,22 @@
 	{
 		"en"        "Velocity (oblivious)"
 	}
+	"TASOverride"
+	{
+		"en"        "Key Override"
+	}
+	"TASOverride_Normal"
+	{
+		"en"        "W/S"
+	}
+	"TASOverride_Surf"
+	{
+		"en"        "W/S (and A/D on surf ramps)"
+	}
+	"TASOverride_All"
+	{
+		"en"        "W/S A/D"
+	}
 	// ---------- Misc ---------- //
 	"BHStartZoneDisallowed"
 	{