diff --git a/images/hud/spinner_saving_strip.tga b/images/hud/spinner_saving_strip.tga
new file mode 100644
index 00000000..fa877b85
Binary files /dev/null and b/images/hud/spinner_saving_strip.tga differ
diff --git a/layout/hud/hud.xml b/layout/hud/hud.xml
index 4304f3df..8988483f 100644
--- a/layout/hud/hud.xml
+++ b/layout/hud/hud.xml
@@ -17,6 +17,7 @@
 
 		<!-- HUD anchored to top-left corner of screen, laid out vertically top-to-bottom -->
 		<Panel id="HudTopLeft" hittest="false" hittestchildren="false">
+			<SaveIndicator />
 		</Panel>
 
 		<!-- Anchored to below the center of the screen, laid out from top to bottom -->
diff --git a/layout/hud/save-indicator.xml b/layout/hud/save-indicator.xml
new file mode 100644
index 00000000..53482d2b
--- /dev/null
+++ b/layout/hud/save-indicator.xml
@@ -0,0 +1,22 @@
+<root>
+	<styles>
+		<include src="file://{resources}/styles/main.scss" />
+		<include src="file://{resources}/styles/hud/save-indicator.scss" />
+	</styles>
+	<scripts>
+		<include src="file://{scripts}/common/dev.ts" />
+		<include src="file://{scripts}/hud/save-indicator.ts" />
+	</scripts>
+
+	<Panel class="save-indicator">
+		<AnimatedImageStrip
+			id="Spinner"
+			animating="true"
+			defaultframe="0"
+			frametime="100ms"
+			src="file://{images}/hud/spinner_saving_strip.tga"
+			scaling="stretch-to-cover-preserve-aspect"
+		/>
+		<Label class="save-indicator__label" id="StatusLabel" text="#PORTAL2_Hud_GameSaved" />
+	</Panel>
+</root>
diff --git a/layout/pages/settings/interface.xml b/layout/pages/settings/interface.xml
index 221dbc90..6e72e182 100644
--- a/layout/pages/settings/interface.xml
+++ b/layout/pages/settings/interface.xml
@@ -135,6 +135,11 @@
 					hasdocspage="false"
 					viewgameduringedit="true"
 				/>
+
+				<SettingsEnum text="#Settings_Hud_Autosave" convar="save_hud_autosave" infomessage="#Settings_Hud_Autosave_Info" hasdocspage="false">
+					<RadioButton group="hudautosave" text="#Common_Off" value="0" />
+					<RadioButton group="hudautosave" text="#Common_On" value="1" />
+				</SettingsEnum>
 			</Panel>
 		</Panel>
 	</Panel>
diff --git a/localization/panorama_english.txt b/localization/panorama_english.txt
index 62255d41..af66b3e9 100644
--- a/localization/panorama_english.txt
+++ b/localization/panorama_english.txt
@@ -94,9 +94,6 @@
 		"HL2_Grenade"						"Fragmentation Grenade"
 		"HL2_RPG"							"RPG\n(Rocket-Propelled Grenade)"
 		"HL2_Bugbait"						"Pheropod\n(Bugbait)"
-
-		"HL2_SAVING"						"Saving..."
-		"HL2_Saved"							"Saved."
 		
 		"HL2_SetupMicrophone"				"Configure Advanced Microphone Settings"
 		"HL2_SetupMicrophoneSteam"			"The Steam Overlay is currently disabled.\nPlease enable the Steam Overlay or configure your microphone settings through the Steam client."
@@ -271,6 +268,15 @@
 		"Instructor_SS_Control"				"Press to Control Other Player"
 
 		"Paint_Instructor_teach_bounce_suppression"				"Hold to prevent bouncing"
+
+		"PORTAL2_Hud_SavingGame"							"Saving Game..."
+		"PORTAL2_Hud_GameSaved"								"Game Saved."
+
+		"PORTAL2_Hud_AutoSavingGame"						"Autosaving Game..."
+		"PORTAL2_Hud_GameAutoSaved"							"Game Autosaved."
+
+		"PORTAL2_Hud_SavingProfile"							"Saving Profile..."
+		"PORTAL2_Hud_ProfileSaved"							"Profile Saved."
 		
 		// Invites
 		"P2COOP_Invite_Title"						"Portal 2: Commnuity Edition Invite"
@@ -795,6 +801,9 @@
 		"Settings_Menu_Movie"							"Main Menu Video Background"
 		"Settings_Menu_Movie_Info"						"Enables the animated main menu background. May be a minor performance loss when the menu is open."
 
+		"Settings_Hud_Autosave"							"Autosave Indicator"
+		"Settings_Hud_Autosave_Info"					"Show an on-screen indicator when the game is automatically saved."
+
 		// Settings - Personalization
 		"Settings_Customization" 						"Customization"
 		
diff --git a/scripts/hud/save-indicator.ts b/scripts/hud/save-indicator.ts
new file mode 100644
index 00000000..0745e953
--- /dev/null
+++ b/scripts/hud/save-indicator.ts
@@ -0,0 +1,62 @@
+'use strict';
+
+class SaveIndicator {
+	static fadeTimer: uuid | undefined = undefined;
+	static isAutoSave: boolean = false;
+
+	static {
+		$.RegisterForUnhandledEvent('GameSaved', this.onSaveStarted.bind(this));
+		$.RegisterForUnhandledEvent('LayoutReloaded', this.hide.bind(this));
+		$.RegisterForUnhandledEvent('LevelInitPostEntity', this.hide.bind(this));
+
+		// Workaround for animation sometimes getting stuck when pausing/unpausing
+		$.RegisterForUnhandledEvent('GameUIStateChanged', (old: GameUIState, now: GameUIState) => {
+			if (now === GameUIState.INGAME) {
+				$<AnimatedImageStrip>('#Spinner')!.SetReadyForDisplay(false);
+			}
+		});
+	}
+
+	static onSaveStarted(save_name: string, save_type: SaveType) {
+		if (!GameInterfaceAPI.GetSettingBool("save_hud")) return;
+
+		if (save_type == SaveType.Autosave) {
+			if (!GameInterfaceAPI.GetSettingBool("save_hud_autosave")) return;
+			this.isAutoSave = true;
+		} else {
+			this.isAutoSave = false;
+		}
+
+		const label = $<Label>('#StatusLabel');
+		label?.SetLocalizationString(this.isAutoSave ? "#PORTAL2_Hud_AutoSavingGame" : "#PORTAL2_Hud_SavingGame");
+
+		this.show();
+		this.fadeOutTimer();
+		
+	}
+
+	static show() {
+		$.GetContextPanel().style.animation = 'FadeIn 0.01s ease-out 0s 1 normal forwards';
+	}
+
+	static hide() {
+		$.GetContextPanel().style.animation = 'FadeOut 0.01s ease-out 0s 1 normal forwards';
+		const kfs = $.GetContextPanel().CreateCopyOfCSSKeyframes('FadeOut');
+		$.GetContextPanel().UpdateCurrentAnimationKeyframes(kfs);
+	}
+
+	static fadeOutTimer() {
+		if (this.fadeTimer !== undefined) $.CancelScheduled(this.fadeTimer);
+		// TODO: Remove hardcoded delay, fadeout should start after the save finishes
+		this.fadeTimer = $.Schedule(1, () => {
+			// Update the text label to say "saved"
+			const label = $<Label>('#StatusLabel');
+			label?.SetLocalizationString(this.isAutoSave ? "#PORTAL2_Hud_GameAutoSaved" : "#PORTAL2_Hud_GameSaved");
+
+			$.GetContextPanel().style.animation = 'FadeOut 1s ease-out 0s 1 normal forwards';
+			const kfs = $.GetContextPanel().CreateCopyOfCSSKeyframes('FadeOut');
+			$.GetContextPanel().UpdateCurrentAnimationKeyframes(kfs);
+			this.fadeTimer = undefined;
+		});
+	}
+}
\ No newline at end of file
diff --git a/scripts/util/panel-registration.ts b/scripts/util/panel-registration.ts
index 91286ce1..ac416440 100644
--- a/scripts/util/panel-registration.ts
+++ b/scripts/util/panel-registration.ts
@@ -7,4 +7,5 @@
 UiToolkitAPI.RegisterPanel2d('LineGraph', 'file://{resources}/layout/components/graphs/line-graph.xml');
 UiToolkitAPI.RegisterPanel2d('VersionInfo', 'file://{resources}/layout/components/version-info.xml');
 UiToolkitAPI.RegisterHUDPanel2d('WeaponSwitcher', 'file://{resources}/layout/hud/weapon-switcher.xml');
+UiToolkitAPI.RegisterHUDPanel2d('SaveIndicator', 'file://{resources}/layout/hud/save-indicator.xml');
 UiToolkitAPI.RegisterPanel2d('SourceIndicator', 'file://{resources}/layout/components/item-source.xml');
diff --git a/styles/hud/save-indicator.scss b/styles/hud/save-indicator.scss
new file mode 100644
index 00000000..59be1627
--- /dev/null
+++ b/styles/hud/save-indicator.scss
@@ -0,0 +1,29 @@
+@use '../config' as *;
+
+.save-indicator {
+	margin: 22px;
+	flow-children: right;
+	height: 90px;
+	width: fit-children;
+
+	&__label {
+		color: $bright-color;
+		font-size: 30px;
+
+		// Alternate style that matches Portal 2
+		// color: #dddddd;
+		// font-family: 'Univers LT Std 57 Cn';
+		// font-size: 34px;
+		
+		vertical-align: center;
+		margin-left: 12px;
+	}
+
+	& > AnimatedImageStrip {
+		width:height-percentage(100%);
+		height: 100%;
+	}
+
+	// Temporary to prevent overlapping with VGUI version!!! Remove this!!!
+	margin-top: 120px;
+}