diff --git a/src/DynamoCoreWpf/Controls/ShortcutToolbar.xaml b/src/DynamoCoreWpf/Controls/ShortcutToolbar.xaml
index 4b8675eedf6..fa6347c47f7 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,-10,0">
+                    <MenuItem Name="loginMenu" Margin="0,-3,-15,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="10,-3,-10,0"                             
+                              Margin="0,-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="-16 0 -30 0">
+                              Margin="-15 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 66124f6206c..0e2e7b2180b 100644
--- a/src/DynamoCoreWpf/Controls/ShortcutToolbar.xaml.cs
+++ b/src/DynamoCoreWpf/Controls/ShortcutToolbar.xaml.cs
@@ -10,7 +10,6 @@
 using Greg.AuthProviders;
 using System.Linq;
 using System.Windows;
-using System.Collections.Generic;
 
 namespace Dynamo.UI.Controls
 {
@@ -46,9 +45,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;
@@ -60,14 +59,6 @@ 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)
@@ -116,110 +107,6 @@ 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 buttonKey)
-        {
-            if (this.shortcutBarItems.Count > 1)
-            {
-                try
-                {
-                    int buttonIndex = ShortcutBarItems.ToList().FindIndex(item => item.ShortcutToolTip.ToUpper().Contains(buttonKey));
-                    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>
diff --git a/src/DynamoCoreWpf/UI/GuidedTour/GuidesManager.cs b/src/DynamoCoreWpf/UI/GuidedTour/GuidesManager.cs
index 48894f07894..89aa2e9aeda 100644
--- a/src/DynamoCoreWpf/UI/GuidedTour/GuidesManager.cs
+++ b/src/DynamoCoreWpf/UI/GuidedTour/GuidesManager.cs
@@ -524,7 +524,6 @@ 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 4c2b7d6ba70..30761d5ec21 100644
--- a/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs
+++ b/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs
@@ -2545,7 +2545,6 @@ 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 59cc26dbffe..9ce89e493f0 100644
--- a/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModelEvents.cs
+++ b/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModelEvents.cs
@@ -157,13 +157,6 @@ 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 e3dcdfec207..cdf6a979763 100644
--- a/src/DynamoCoreWpf/Views/Core/DynamoView.xaml
+++ b/src/DynamoCoreWpf/Views/Core/DynamoView.xaml
@@ -363,14 +363,12 @@
                         <MenuItem Header="{x:Static p:Resources.DynamoViewFileMenuSave}"
                                   Command="{Binding ShowSaveDialogIfNeededAndSaveResultCommand}"
                                   Name="saveThisButton"
-                                  InputGestureText="Ctrl + S"
-                                  IsEnabled="False">
+                                  InputGestureText="Ctrl + S">
                         </MenuItem>
                         <MenuItem Header="{x:Static p:Resources.DynamoViewFileMenuSaveAs}"
                                   Command="{Binding ShowSaveDialogAndSaveResultCommand}"
                                   Name="saveButton"
-                                  InputGestureText="Ctrl + Shift + S"
-                                  IsEnabled="False">
+                                  InputGestureText="Ctrl + Shift + S">
                         </MenuItem>
                         <Separator />
                         <MenuItem Header="{x:Static p:Resources.DynamoViewFileMenuImport}"
@@ -379,8 +377,7 @@
                         <Separator />
                         <MenuItem Header="{x:Static p:Resources.DynamoViewFileMenuExport}"
                                   Name="exportMenu"
-                                  Tag="NoDownArrow"
-                                  IsEnabled="False">
+                                  Tag="NoDownArrow">
                             <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 d0b3bf4bdc1..45de26f3270 100644
--- a/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs
+++ b/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs
@@ -234,7 +234,6 @@ 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)
@@ -247,44 +246,15 @@ 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)
         {
-            saveThisButton.IsEnabled = true;
-            saveButton.IsEnabled = true;
-            exportMenu.IsEnabled = true;
-
-            ShortcutBar.IsSaveButtonEnabled = true;
-            shortcutBar.IsExportMenuEnabled = true;
-
             if (!(workspace is HomeWorkspaceModel hws))
-            return;
-            
+                return;
+
             foreach (var extension in viewExtensionManager.StorageAccessViewExtensions)
             {
                 DynamoModel.RaiseIExtensionStorageAccessWorkspaceOpened(hws, extension, dynamoViewModel.Model.Logger);
-            }            
+            }
         }
 
         private void OnWorkspaceSaving(WorkspaceModel workspace, Graph.SaveContext saveContext)
@@ -894,7 +864,7 @@ private void InitializeShortcutBar()
             shortcutBar.ShortcutBarItems.Add(saveButton);
             shortcutBar.ShortcutBarItems.Add(undoButton);
             shortcutBar.ShortcutBarItems.Add(redoButton);
-            
+
             shortcutBarGrid.Children.Add(shortcutBar);
         }
 
@@ -1088,7 +1058,7 @@ private void DynamoView_Loaded(object sender, EventArgs e)
             else
             {
                 DynamoUtilities.DynamoFeatureFlagsManager.FlagsRetrieved += CheckTestFlags;
-            }            
+            }
         }
 
         private void GuideFlowEvents_GuidedTourStart(GuidedTourStateEventArgs args)
@@ -1687,8 +1657,6 @@ 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();
         }
@@ -2503,9 +2471,8 @@ 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)
             {