diff --git a/src/lib/components/workspace/Prompts/PromptEditor.svelte b/src/lib/components/workspace/Prompts/PromptEditor.svelte
index 732825524..485efa536 100644
--- a/src/lib/components/workspace/Prompts/PromptEditor.svelte
+++ b/src/lib/components/workspace/Prompts/PromptEditor.svelte
@@ -77,6 +77,10 @@
 			commitMessage = '';
 			isProduction = true;
 			await loadHistory();
+			// Select the newest version after saving
+			if (history.length > 0) {
+				selectedHistoryEntry = history[0];
+			}
 		} else {
 			toast.error(
 				$i18n.t('Only alphanumeric characters and hyphens are allowed in the command string.')