diff --git a/src/DynamoCoreWpf/Controls/ShortcutToolbar.xaml b/src/DynamoCoreWpf/Controls/ShortcutToolbar.xaml
index fa6347c47f7..4b8675eedf6 100644
--- a/src/DynamoCoreWpf/Controls/ShortcutToolbar.xaml
+++ b/src/DynamoCoreWpf/Controls/ShortcutToolbar.xaml
@@ -138,7 +138,7 @@
                       Style="{StaticResource MainMenu}"
                       Margin="0,0,10,0"
                       IsMainMenu="True">
-                    <MenuItem Name="loginMenu" Margin="0,-3,-15,0">
+                    <MenuItem Name="loginMenu" Margin="0,-3,-10,0">
                         <MenuItem.Header>
                             <Button Name="LoginButton" Click="LoginButton_OnClick" Foreground="#DCDCDC" Padding="5,0,5,0">
                                 <StackPanel FlowDirection="LeftToRight" Orientation="Horizontal">
@@ -222,11 +222,11 @@
                         </MenuItem>
                     </MenuItem>
                     <MenuItem Name="exportMenu"
-                              Cursor="Hand"
+                              Cursor="Hand"                            
                               Focusable="False"
-                              Margin="0,-3,-10,0"
+                              Margin="10,-3,-10,0"                             
                               MouseEnter="exportMenu_MouseEnter"
-                              MouseLeave="exportMenu_MouseLeave">
+                              MouseLeave="exportMenu_MouseLeave">  
                         <MenuItem.Header>
                             <StackPanel Orientation="Horizontal">
                                 <Image x:Name="Icon"
@@ -262,7 +262,7 @@
                         </MenuItem>
                     </MenuItem>
                     <MenuItem Name="NotificationCenter"
-                              Margin="-15 0 -30 0">
+                              Margin="-16 0 -30 0">
                         <MenuItem.Header>
                             <Button x:Name="notificationsButton"
                                     BorderBrush="Transparent"
diff --git a/src/DynamoCoreWpf/Controls/ShortcutToolbar.xaml.cs b/src/DynamoCoreWpf/Controls/ShortcutToolbar.xaml.cs
index 0e2e7b2180b..00ba4a46a7c 100644
--- a/src/DynamoCoreWpf/Controls/ShortcutToolbar.xaml.cs
+++ b/src/DynamoCoreWpf/Controls/ShortcutToolbar.xaml.cs
@@ -10,6 +10,7 @@
 using Greg.AuthProviders;
 using System.Linq;
 using System.Windows;
+using System.Collections.Generic;
 
 namespace Dynamo.UI.Controls
 {
@@ -45,9 +46,9 @@ public ObservableCollection<ShortcutBarItem> ShortcutBarRightSideItems
         public ShortcutToolbar(DynamoViewModel dynamoViewModel)
         {
             shortcutBarItems = new ObservableCollection<ShortcutBarItem>();
-            shortcutBarRightSideItems = new ObservableCollection<ShortcutBarItem>();    
+            shortcutBarRightSideItems = new ObservableCollection<ShortcutBarItem>();
 
-            InitializeComponent();         
+            InitializeComponent();
 
             var shortcutToolbar = new ShortcutToolbarViewModel(dynamoViewModel);
             DataContext = shortcutToolbar;
@@ -59,6 +60,14 @@ public ShortcutToolbar(DynamoViewModel dynamoViewModel)
             else {
                 logoutOption.Visibility = Visibility.Collapsed;
             }
+
+            this.Loaded += ShortcutToolbar_Loaded;
+        }
+
+        private void ShortcutToolbar_Loaded(object sender, RoutedEventArgs e)
+        {
+            IsSaveButtonEnabled = false;
+            IsExportMenuEnabled = false;
         }
 
         private void SignOutHandler(LoginState status)
@@ -107,6 +116,110 @@ private void LoginButton_OnClick(object sender, RoutedEventArgs e)
                 }
             }
         }
+
+        public List<Control> AllChildren(DependencyObject parent)
+        {
+            var _list = new List<Control> { };
+            for (int i = 0; i < VisualTreeHelper.GetChildrenCount(parent); i++)
+            {
+                var _child = VisualTreeHelper.GetChild(parent, i);
+                if (_child is Control)
+                {
+                    _list.Add(_child as Control);
+                    _list.AddRange(AllChildren(_child));
+                }
+            }
+            return _list;
+        }
+
+        private Button GetButton(string shortcutName)
+        {
+            if (this.shortcutBarItems.Count > 1)
+            {
+                try
+                {
+                    int buttonIndex = ShortcutBarItems.ToList().FindIndex(item => item.Name.ToUpper() == shortcutName);
+                    var _container = ShortcutItemsControl.ItemContainerGenerator.ContainerFromIndex(buttonIndex);
+                    var _children = AllChildren(_container);
+                    var _control = (Button)_children.First();
+                    return _control;
+                }
+                catch (System.Exception)
+                {
+                    return null;
+                }                
+            }
+            else
+            {
+                return null;
+            }
+        }
+
+        internal bool IsNewButtonEnabled
+        {
+            set
+            {
+                Button saveButton = GetButton("NEW");
+                if (saveButton != null)
+                {
+                    saveButton.IsEnabled = value;
+                    saveButton.Opacity = value ? 1 : 0.5;
+                }
+            }
+        }
+
+        internal bool IsOpenButtonEnabled
+        {
+            set
+            {
+                Button saveButton = GetButton("OPEN");
+                if (saveButton != null)
+                {
+                    saveButton.IsEnabled = value;
+                    saveButton.Opacity = value ? 1 : 0.5;
+                }
+            }
+        }
+
+        internal bool IsSaveButtonEnabled
+        {
+            set
+            {
+                Button saveButton = GetButton("SAVE");
+                if (saveButton != null)
+                {
+                    saveButton.IsEnabled = value;
+                    saveButton.Opacity = value ? 1 : 0.5;
+                }
+            }
+        }
+
+        internal bool IsLoginMenuEnabled
+        {
+            set
+            {
+                this.loginMenu.IsEnabled = value;
+                this.loginMenu.Opacity = value ? 1 : 0.5;
+            }
+        }
+
+        internal bool IsExportMenuEnabled
+        {
+            set
+            {
+                this.exportMenu.IsEnabled = value;
+                this.exportMenu.Opacity = value ? 1 : 0.5;
+            }
+        }
+
+        internal bool IsNotificationCenterEnabled
+        {
+            set
+            {
+                this.NotificationCenter.IsEnabled = value;
+                this.NotificationCenter.Opacity = value ? 1 : 0.5;
+            }
+        }
     }
 
     /// <summary>
@@ -149,6 +262,11 @@ public virtual string ShortcutToolTip
             get { return shortcutToolTip; }
             set { shortcutToolTip = value; }
         }
+
+        /// <summary>
+        /// The Name of the shortcut
+        /// </summary>
+        public string Name { get; set; }
     }
 
     internal partial class ImageExportShortcutBarItem : ShortcutBarItem
diff --git a/src/DynamoCoreWpf/UI/GuidedTour/GuidesManager.cs b/src/DynamoCoreWpf/UI/GuidedTour/GuidesManager.cs
index 89aa2e9aeda..48894f07894 100644
--- a/src/DynamoCoreWpf/UI/GuidedTour/GuidesManager.cs
+++ b/src/DynamoCoreWpf/UI/GuidedTour/GuidesManager.cs
@@ -524,6 +524,7 @@ internal Guide GetNextGuide()
 
         private void Popup_StepClosed(string name, Step.StepTypes stepType)
         {
+            dynamoViewModel.OnEnableShortcutBarItems(true);
             GuideFlowEvents.OnGuidedTourFinish(currentGuide.Name);
 
             //The exit tour popup will be shown only when a popup (doesn't apply for survey) is closed or when the tour is closed. 
diff --git a/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs
index a38b7470439..25c4c6df9c5 100644
--- a/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs
+++ b/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs
@@ -2213,6 +2213,7 @@ private void ShowNewFunctionDialogAndMakeFunction(object parameter)
                 this.ShowStartPage = false;
 
                 SetDefaultScaleFactor(Workspaces.FirstOrDefault(viewModels => viewModels.Model is CustomNodeWorkspaceModel));
+                OnEnableShortcutBarItems(true);
             }
         }
 
@@ -2527,6 +2528,7 @@ public void MakeNewHomeWorkspace(object parameter)
                 ShowStartPage = false; // Hide start page if there's one.
 
                 SetDefaultScaleFactor(Workspaces.FirstOrDefault());
+                OnEnableShortcutBarItems(true);
             }
         }
 
@@ -2540,6 +2542,7 @@ private void CloseHomeWorkspace(object parameter)
                 // workspaces opened at the time, then we should show the start page.
                 this.ShowStartPage = (Model.Workspaces.Count() <= 1);
                 RunSettings.ForceBlockRun = false;
+                OnEnableShortcutBarItems(false);
             }
         }
 
diff --git a/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModelEvents.cs b/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModelEvents.cs
index 9ce89e493f0..59cc26dbffe 100644
--- a/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModelEvents.cs
+++ b/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModelEvents.cs
@@ -157,6 +157,13 @@ internal void OnRequestReturnFocusToView()
                 RequestReturnFocusToView();
         }
 
+        public event Action<bool> RequestEnableShortcutBarItems;
+        public virtual void OnEnableShortcutBarItems(bool enable)
+        {
+            if (RequestEnableShortcutBarItems != null)
+                RequestEnableShortcutBarItems(enable);
+        }
+
         /// <summary>
         /// Event used to verify that the correct dialog is being showed when saving a graph with unresolved linter issues.
         /// This is only meant to be used for unit testing purposes.
diff --git a/src/DynamoCoreWpf/Views/Core/DynamoView.xaml b/src/DynamoCoreWpf/Views/Core/DynamoView.xaml
index cdf6a979763..e3dcdfec207 100644
--- a/src/DynamoCoreWpf/Views/Core/DynamoView.xaml
+++ b/src/DynamoCoreWpf/Views/Core/DynamoView.xaml
@@ -363,12 +363,14 @@
                         <MenuItem Header="{x:Static p:Resources.DynamoViewFileMenuSave}"
                                   Command="{Binding ShowSaveDialogIfNeededAndSaveResultCommand}"
                                   Name="saveThisButton"
-                                  InputGestureText="Ctrl + S">
+                                  InputGestureText="Ctrl + S"
+                                  IsEnabled="False">
                         </MenuItem>
                         <MenuItem Header="{x:Static p:Resources.DynamoViewFileMenuSaveAs}"
                                   Command="{Binding ShowSaveDialogAndSaveResultCommand}"
                                   Name="saveButton"
-                                  InputGestureText="Ctrl + Shift + S">
+                                  InputGestureText="Ctrl + Shift + S"
+                                  IsEnabled="False">
                         </MenuItem>
                         <Separator />
                         <MenuItem Header="{x:Static p:Resources.DynamoViewFileMenuImport}"
@@ -377,7 +379,8 @@
                         <Separator />
                         <MenuItem Header="{x:Static p:Resources.DynamoViewFileMenuExport}"
                                   Name="exportMenu"
-                                  Tag="NoDownArrow">
+                                  Tag="NoDownArrow"
+                                  IsEnabled="False">
                             <MenuItem Header="{x:Static p:Resources.DynamoViewFileMenuExportAsImage}"
                                       Command="{Binding ShowSaveImageDialogAndSaveResultCommand}"
                                       Name="saveImage">
diff --git a/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs b/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs
index 259511141a0..7d7d30f456c 100644
--- a/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs
+++ b/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs
@@ -227,6 +227,7 @@ public DynamoView(DynamoViewModel dynamoViewModel)
             this.dynamoViewModel.RequestReturnFocusToView += OnRequestReturnFocusToView;
             this.dynamoViewModel.Model.WorkspaceSaving += OnWorkspaceSaving;
             this.dynamoViewModel.Model.WorkspaceOpened += OnWorkspaceOpened;
+            this.dynamoViewModel.RequestEnableShortcutBarItems += DynamoViewModel_RequestEnableShortcutBarItems;
             FocusableGrid.InputBindings.Clear();
 
             if (fileTrustWarningPopup == null)
@@ -239,15 +240,44 @@ public DynamoView(DynamoViewModel dynamoViewModel)
             }
         }
 
+        private void DynamoViewModel_RequestEnableShortcutBarItems(bool enable)
+        {
+            saveThisButton.IsEnabled = enable;
+            saveButton.IsEnabled = enable;
+            exportMenu.IsEnabled = enable;
+            
+            shortcutBar.IsNewButtonEnabled = enable;
+            shortcutBar.IsOpenButtonEnabled = enable;
+            shortcutBar.IsSaveButtonEnabled = enable;
+            shortcutBar.IsLoginMenuEnabled = enable;
+            shortcutBar.IsExportMenuEnabled  = enable;
+            shortcutBar.IsNotificationCenterEnabled = enable;
+
+            if(dynamoViewModel.ShowStartPage)
+            {
+                shortcutBar.IsNewButtonEnabled = true;
+                shortcutBar.IsOpenButtonEnabled = true;
+                shortcutBar.IsLoginMenuEnabled = true;
+                shortcutBar.IsNotificationCenterEnabled = true;
+            }
+        }
+
         private void OnWorkspaceOpened(WorkspaceModel workspace)
         {
-            if (!(workspace is HomeWorkspaceModel hws))
-                return;
+            saveThisButton.IsEnabled = true;
+            saveButton.IsEnabled = true;
+            exportMenu.IsEnabled = true;
 
+            ShortcutBar.IsSaveButtonEnabled = true;
+            shortcutBar.IsExportMenuEnabled = true;
+
+            if (!(workspace is HomeWorkspaceModel hws))
+            return;
+            
             foreach (var extension in viewExtensionManager.StorageAccessViewExtensions)
             {
                 DynamoModel.RaiseIExtensionStorageAccessWorkspaceOpened(hws, extension, dynamoViewModel.Model.Logger);
-            }
+            }            
         }
 
         private void OnWorkspaceSaving(WorkspaceModel workspace, Graph.SaveContext saveContext)
@@ -809,7 +839,8 @@ private void InitializeShortcutBar()
                 ShortcutCommandParameter = null,
                 ImgNormalSource = "/DynamoCoreWpf;component/UI/Images/new_normal.png",
                 ImgDisabledSource = "/DynamoCoreWpf;component/UI/Images/new_disabled.png",
-                ImgHoverSource = "/DynamoCoreWpf;component/UI/Images/new_normal.png"
+                ImgHoverSource = "/DynamoCoreWpf;component/UI/Images/new_normal.png",
+                Name = "New"
             };
 
             var openScriptButton = new ShortcutBarItem
@@ -819,7 +850,8 @@ private void InitializeShortcutBar()
                 ShortcutCommandParameter = null,
                 ImgNormalSource = "/DynamoCoreWpf;component/UI/Images/open_normal.png",
                 ImgDisabledSource = "/DynamoCoreWpf;component/UI/Images/open_disabled.png",
-                ImgHoverSource = "/DynamoCoreWpf;component/UI/Images/open_normal.png"
+                ImgHoverSource = "/DynamoCoreWpf;component/UI/Images/open_normal.png",
+                Name = "Open"
             };
 
             var saveButton = new ShortcutBarItem
@@ -829,7 +861,8 @@ private void InitializeShortcutBar()
                 ShortcutCommandParameter = null,
                 ImgNormalSource = "/DynamoCoreWpf;component/UI/Images/save_normal.png",
                 ImgDisabledSource = "/DynamoCoreWpf;component/UI/Images/save_disabled.png",
-                ImgHoverSource = "/DynamoCoreWpf;component/UI/Images/save_normal.png"
+                ImgHoverSource = "/DynamoCoreWpf;component/UI/Images/save_normal.png",
+                Name = "Save"
             };
 
             var undoButton = new ShortcutBarItem
@@ -839,7 +872,8 @@ private void InitializeShortcutBar()
                 ShortcutCommandParameter = null,
                 ImgNormalSource = "/DynamoCoreWpf;component/UI/Images/undo_normal.png",
                 ImgDisabledSource = "/DynamoCoreWpf;component/UI/Images/undo_disabled.png",
-                ImgHoverSource = "/DynamoCoreWpf;component/UI/Images/undo_normal.png"
+                ImgHoverSource = "/DynamoCoreWpf;component/UI/Images/undo_normal.png",
+                Name = "Undo"
             };
 
             var redoButton = new ShortcutBarItem
@@ -849,7 +883,8 @@ private void InitializeShortcutBar()
                 ShortcutCommandParameter = null,
                 ImgNormalSource = "/DynamoCoreWpf;component/UI/Images/redo_normal.png",
                 ImgDisabledSource = "/DynamoCoreWpf;component/UI/Images/redo_disabled.png",
-                ImgHoverSource = "/DynamoCoreWpf;component/UI/Images/redo_normal.png"
+                ImgHoverSource = "/DynamoCoreWpf;component/UI/Images/redo_normal.png",
+                Name = "Redo"
             };
 
             shortcutBar.ShortcutBarItems.Add(newScriptButton);
@@ -857,7 +892,7 @@ private void InitializeShortcutBar()
             shortcutBar.ShortcutBarItems.Add(saveButton);
             shortcutBar.ShortcutBarItems.Add(undoButton);
             shortcutBar.ShortcutBarItems.Add(redoButton);
-
+            
             shortcutBarGrid.Children.Add(shortcutBar);
         }
 
@@ -1051,7 +1086,7 @@ private void DynamoView_Loaded(object sender, EventArgs e)
             else
             {
                 DynamoUtilities.DynamoFeatureFlagsManager.FlagsRetrieved += CheckTestFlags;
-            }
+            }            
         }
 
         private void GuideFlowEvents_GuidedTourStart(GuidedTourStateEventArgs args)
@@ -1650,6 +1685,8 @@ private void WindowClosed(object sender, EventArgs e)
             this.dynamoViewModel.Model.WorkspaceOpened -= OnWorkspaceOpened;
             DynamoUtilities.DynamoFeatureFlagsManager.FlagsRetrieved -= CheckTestFlags;
 
+            this.dynamoViewModel.RequestEnableShortcutBarItems -= DynamoViewModel_RequestEnableShortcutBarItems;
+
             this.Dispose();
             sharedViewExtensionLoadedParams?.Dispose();
         }
@@ -2463,8 +2500,9 @@ private void ShowGetStartedGuidedTour()
         {
             //We pass the root UIElement to the GuidesManager so we can found other child UIElements
             try
-            {
+            {                
                 dynamoViewModel.MainGuideManager.LaunchTour(GuidesManager.GetStartedGuideName);
+                dynamoViewModel.OnEnableShortcutBarItems(false);
             }
             catch (Exception)
             {