diff --git a/src/DynamoCoreWpf/Controls/ShortcutToolbar.xaml.cs b/src/DynamoCoreWpf/Controls/ShortcutToolbar.xaml.cs
index 5c154ffe08a..59278bd64bd 100644
--- a/src/DynamoCoreWpf/Controls/ShortcutToolbar.xaml.cs
+++ b/src/DynamoCoreWpf/Controls/ShortcutToolbar.xaml.cs
@@ -77,7 +77,6 @@ public ShortcutToolbar(DynamoViewModel dynamoViewModel)
 
         private void ShortcutToolbar_Loaded(object sender, RoutedEventArgs e)
         {
-            IsSaveButtonEnabled = false;
             IsExportMenuEnabled = false;
             IsLoginMenuEnabled = !DynamoViewModel.Model.NoNetworkMode;
             DynamoViewModel.OnRequestShorcutToolbarLoaded(RightMenu.ActualWidth);
@@ -245,19 +244,6 @@ internal bool IsOpenButtonEnabled
             }
         }
 
-        internal bool IsSaveButtonEnabled
-        {
-            set
-            {
-                Button saveButton = GetButton("SAVE");
-                if (saveButton != null)
-                {
-                    saveButton.IsEnabled = value;
-                    saveButton.Opacity = value ? 1 : 0.5;
-                }
-            }
-        }
-
         internal bool IsLoginMenuEnabled
         {
             set
diff --git a/src/DynamoCoreWpf/UI/GuidedTour/GuidesManager.cs b/src/DynamoCoreWpf/UI/GuidedTour/GuidesManager.cs
index ca728b460a7..046d44ecb02 100644
--- a/src/DynamoCoreWpf/UI/GuidedTour/GuidesManager.cs
+++ b/src/DynamoCoreWpf/UI/GuidedTour/GuidesManager.cs
@@ -164,6 +164,7 @@ internal void LaunchTour(string tourName)
                 GuideFlowEvents.OnGuidedTourStart(tourName);
                 dynamoViewModel.ToastManager?.CloseRealTimeInfoWindow();
                 dynamoViewModel.OnEnableShortcutBarItems(false);
+                dynamoViewModel.SetGuidedTourActive(true);
                 Logging.Analytics.TrackScreenView("InteractiveGuidedTours");
                 Logging.Analytics.TrackEvent(Logging.Actions.Start, Logging.Categories.GuidedTourOperations, Resources.ResourceManager.GetString(currentGuide.GuideNameResource, System.Globalization.CultureInfo.InvariantCulture).Replace("_", ""), currentGuide.SequenceOrder);
             }
@@ -257,6 +258,7 @@ internal void ExitTour()
                 }
 
                 dynamoViewModel.OnEnableShortcutBarItems(true);
+                dynamoViewModel.SetGuidedTourActive(false);
 
                 //Hide guide background overlay
                 guideBackgroundElement.Visibility = Visibility.Hidden;
diff --git a/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs
index 46459a29fb1..ca5078ec86a 100644
--- a/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs
+++ b/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs
@@ -72,6 +72,8 @@ public partial class DynamoViewModel : ViewModelBase, IDynamoViewModel
         private readonly DynamoModel model;
         private Point transformOrigin;
         private bool showStartPage = false;
+        private bool isGuidedTourActive = false;
+        private WorkspaceModel saveCommandsTrackedWorkspace;
         private PreferencesViewModel preferencesViewModel;
         private string dynamoMLDataPath = string.Empty;
         private const string dynamoMLDataFileName = "DynamoMLDataPipeline.json";
@@ -428,6 +430,9 @@ public bool ShowStartPage
 
                 if(ShowInsertDialogAndInsertResultCommand != null)
                     ShowInsertDialogAndInsertResultCommand.RaiseCanExecuteChanged();
+
+                ShowSaveDialogIfNeededAndSaveResultCommand?.RaiseCanExecuteChanged();
+                ShowSaveDialogAndSaveResultCommand?.RaiseCanExecuteChanged();
             }
         }
 
@@ -898,6 +903,7 @@ protected DynamoViewModel(StartConfiguration startConfiguration)
             SubscribeModelUiEvents();
             SubscribeModelChangedHandlers();
             SubscribeModelBackupFileSaveEvent();
+            TrackWorkspaceForSaveCommands(model.CurrentWorkspace);
 
             InitializeAutomationSettings(startConfiguration.CommandFilePath);
 
@@ -1304,6 +1310,32 @@ private void UnsubscribeModelChangedEvents()
             model.PropertyChanged -= _model_PropertyChanged;
             model.WorkspaceCleared -= ModelWorkspaceCleared;
             model.RequestCancelActiveStateForNode -= this.CancelActiveState;
+            TrackWorkspaceForSaveCommands(null);
+        }
+
+        /// <summary>
+        /// Keeps the Save command's CanExecute in sync with the current workspace's dirty
+        /// flag: unsubscribes from the previously tracked workspace and subscribes to the
+        /// new one, then re-evaluates CanExecute immediately (the new workspace may already
+        /// differ in HasUnsavedChanges from the old one).
+        /// </summary>
+        private void TrackWorkspaceForSaveCommands(WorkspaceModel workspace)
+        {
+            if (saveCommandsTrackedWorkspace != null)
+                saveCommandsTrackedWorkspace.PropertyChanged -= SaveCommandsTrackedWorkspace_PropertyChanged;
+
+            saveCommandsTrackedWorkspace = workspace;
+
+            if (saveCommandsTrackedWorkspace != null)
+                saveCommandsTrackedWorkspace.PropertyChanged += SaveCommandsTrackedWorkspace_PropertyChanged;
+
+            ShowSaveDialogIfNeededAndSaveResultCommand?.RaiseCanExecuteChanged();
+        }
+
+        private void SaveCommandsTrackedWorkspace_PropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            if (e.PropertyName == nameof(WorkspaceModel.HasUnsavedChanges))
+                ShowSaveDialogIfNeededAndSaveResultCommand.RaiseCanExecuteChanged();
         }
 
         private void SubscribeDispatcherHandlers()
@@ -1482,6 +1514,7 @@ void _model_PropertyChanged(object sender, PropertyChangedEventArgs e)
                     RaisePropertyChanged("ViewingHomespace");
                     if (this.PublishCurrentWorkspaceCommand != null)
                         this.PublishCurrentWorkspaceCommand.RaiseCanExecuteChanged();
+                    TrackWorkspaceForSaveCommands(model.CurrentWorkspace);
                     RaisePropertyChanged("IsPanning");
                     RaisePropertyChanged("IsOrbiting");
                     //RaisePropertyChanged("RunEnabled");
@@ -3245,9 +3278,28 @@ public void ShowSaveDialogIfNeededAndSaveResult(object parameter)
             }
         }
 
+        /// <summary>
+        /// "Save" is only meaningful when there is something new to persist, so it is also
+        /// gated on the current workspace's dirty flag (unlike "Save As", which can always
+        /// save a copy regardless of whether anything changed).
+        /// </summary>
         internal bool CanShowSaveDialogIfNeededAndSaveResultCommand(object parameter)
         {
-            return true;
+            return !isGuidedTourActive && !ShowStartPage && (Model.CurrentWorkspace?.HasUnsavedChanges ?? false);
+        }
+
+        /// <summary>
+        /// Blocks or unblocks the Save/Save As commands (menu items, shortcut bar, and
+        /// Ctrl+S/Ctrl+Shift+S) while a guided tour is active. Unlike ShowStartPage, this is
+        /// not tied to workspace-creation flows, so it can safely gate CanExecute without
+        /// resurrecting DYN-10717 (Save/Save As stuck disabled on a fresh workspace).
+        /// </summary>
+        /// <param name="isActive">Whether a guided tour is currently active.</param>
+        internal void SetGuidedTourActive(bool isActive)
+        {
+            isGuidedTourActive = isActive;
+            ShowSaveDialogIfNeededAndSaveResultCommand.RaiseCanExecuteChanged();
+            ShowSaveDialogAndSaveResultCommand.RaiseCanExecuteChanged();
         }
 
         public void ShowSaveDialogAndSaveResult(object parameter)
@@ -3371,7 +3423,7 @@ private bool ShowWarningDialogOnSaveWithUnresolvedIssues()
 
         internal bool CanShowSaveDialogAndSaveResult(object parameter)
         {
-            return true;
+            return !isGuidedTourActive && !ShowStartPage;
         }
 
         public void ToggleFullscreenWatchShowing(object parameter)
diff --git a/src/DynamoCoreWpf/Views/Core/DynamoView.xaml b/src/DynamoCoreWpf/Views/Core/DynamoView.xaml
index 28bd90a97ed..fa532c6668b 100644
--- a/src/DynamoCoreWpf/Views/Core/DynamoView.xaml
+++ b/src/DynamoCoreWpf/Views/Core/DynamoView.xaml
@@ -354,13 +354,11 @@
                         <MenuItem Name="saveThisButton"
                                   Command="{Binding ShowSaveDialogIfNeededAndSaveResultCommand}"
                                   Header="{x:Static p:Resources.DynamoViewFileMenuSave}"
-                                  InputGestureText="Ctrl + S"
-                                  IsEnabled="False" />
+                                  InputGestureText="Ctrl + S" />
                         <MenuItem Name="saveButton"
                                   Command="{Binding ShowSaveDialogAndSaveResultCommand}"
                                   Header="{x:Static p:Resources.DynamoViewFileMenuSaveAs}"
-                                  InputGestureText="Ctrl + Shift + S"
-                                  IsEnabled="False" />
+                                  InputGestureText="Ctrl + Shift + S" />
                         <Separator />
                         <MenuItem Name="importLibrary"
                                   Command="{Binding Path=DataContext.ImportLibraryCommand, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type controls:DynamoView}}}"
diff --git a/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs b/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs
index 6f228b05de3..1fb06d80db9 100644
--- a/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs
+++ b/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs
@@ -435,11 +435,6 @@ void DynamoView_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
 
         private void DynamoViewModel_RequestEnableShortcutBarItems(bool enable)
         {
-            if (!(saveThisButton is null))
-            {
-                saveThisButton.IsEnabled = enable;
-                saveButton.IsEnabled = enable;
-            }
             if (!(exportMenu is null))
             {
                 exportMenu.IsEnabled = enable;
@@ -449,7 +444,6 @@ private void DynamoViewModel_RequestEnableShortcutBarItems(bool enable)
             {
                 shortcutBar.IsNewButtonEnabled = enable;
                 shortcutBar.IsOpenButtonEnabled = enable;
-                shortcutBar.IsSaveButtonEnabled = enable;
                 shortcutBar.IsLoginMenuEnabled = enable;
                 shortcutBar.IsExportMenuEnabled = enable;
                 shortcutBar.IsNotificationCenterEnabled = enable;
@@ -471,19 +465,12 @@ private void DynamoViewModel_RequestEnableShortcutBarItems(bool enable)
 
         private void OnWorkspaceOpened(WorkspaceModel workspace)
         {
-            if (!(saveThisButton is null))
-            {
-                saveThisButton.IsEnabled = true;
-                saveButton.IsEnabled = true;
-            }
-
             if (!(exportMenu is null))
             {
                 exportMenu.IsEnabled = true;
             }
             if (!(shortcutBar is null))
             {
-                ShortcutBar.IsSaveButtonEnabled = true;
                 shortcutBar.IsExportMenuEnabled = true;
             }
 
diff --git a/test/DynamoCoreWpfTests/DynamoViewTests.cs b/test/DynamoCoreWpfTests/DynamoViewTests.cs
index aa2d494b902..4966e987fc0 100644
--- a/test/DynamoCoreWpfTests/DynamoViewTests.cs
+++ b/test/DynamoCoreWpfTests/DynamoViewTests.cs
@@ -136,6 +136,57 @@ public void TestHomeWorkspaceClosedBeforeCustomNode()
             Assert.IsTrue(View.saveButton.IsEnabled);
         }
 
+        [Test]
+        public void WhenDynamoLaunchesThenSaveAsIsEnabledButSaveIsDisabledUntilDirty()
+        {
+            // Regression test for DYN-10717: Save/Save As enablement is driven by a shared CanExecute (menu, hotkey, toolbar all in sync), with "Save" additionally gated on the workspace's dirty flag.
+            Assert.IsFalse(ViewModel.ShowSaveDialogIfNeededAndSaveResultCommand.CanExecute(null));
+            Assert.IsTrue(ViewModel.ShowSaveDialogAndSaveResultCommand.CanExecute(null));
+
+            ViewModel.HomeSpace.HasUnsavedChanges = true;
+
+            Assert.IsTrue(ViewModel.ShowSaveDialogIfNeededAndSaveResultCommand.CanExecute(null));
+        }
+
+        [Test]
+        public void WhenLastWorkspaceIsClosedThenSaveMenuItemsAreDisabled()
+        {
+            // Regression test for DYN-10717: closing the only open workspace shows the Start Page, where Save/Save As are intentionally disabled (this is not the bug; the bug was menu/hotkey/toolbar disagreeing with each other).
+            var wasTestMode = DynamoModel.IsTestMode;
+            try
+            {
+                DynamoModel.IsTestMode = false;
+                ViewModel.CloseHomeWorkspaceCommand.Execute(null);
+            }
+            finally
+            {
+                DynamoModel.IsTestMode = wasTestMode;
+            }
+
+            Assert.IsTrue(ViewModel.ShowStartPage);
+            Assert.IsFalse(ViewModel.ShowSaveDialogIfNeededAndSaveResultCommand.CanExecute(null));
+            Assert.IsFalse(ViewModel.ShowSaveDialogAndSaveResultCommand.CanExecute(null));
+        }
+
+        [Test]
+        public void WhenGuidedTourIsActiveThenSaveMenuItemsAreDisabledUntilExit()
+        {
+            // Regression test for DYN-10717: Save/Save As must be disabled while a guided tour is active, and re-enabled once it ends.
+            ViewModel.HomeSpace.HasUnsavedChanges = true;
+            Assert.IsTrue(ViewModel.ShowSaveDialogIfNeededAndSaveResultCommand.CanExecute(null));
+            Assert.IsTrue(ViewModel.ShowSaveDialogAndSaveResultCommand.CanExecute(null));
+
+            ViewModel.SetGuidedTourActive(true);
+
+            Assert.IsFalse(ViewModel.ShowSaveDialogIfNeededAndSaveResultCommand.CanExecute(null));
+            Assert.IsFalse(ViewModel.ShowSaveDialogAndSaveResultCommand.CanExecute(null));
+
+            ViewModel.SetGuidedTourActive(false);
+
+            Assert.IsTrue(ViewModel.ShowSaveDialogIfNeededAndSaveResultCommand.CanExecute(null));
+            Assert.IsTrue(ViewModel.ShowSaveDialogAndSaveResultCommand.CanExecute(null));
+        }
+
         [Test]
         public void ElementBinding_SaveAs()
         {