diff --git a/src/DynamoCoreWpf/Controls/ShortcutToolbar.xaml.cs b/src/DynamoCoreWpf/Controls/ShortcutToolbar.xaml.cs
index 39cd666fd9e..7bdad583b1d 100644
--- a/src/DynamoCoreWpf/Controls/ShortcutToolbar.xaml.cs
+++ b/src/DynamoCoreWpf/Controls/ShortcutToolbar.xaml.cs
@@ -59,9 +59,12 @@ public ShortcutToolbar(DynamoViewModel dynamoViewModel)
             if (authManager != null)
             {
                 authManager.LoginStateChanged += AuthChangeHandler;
-                if (authManager.LoginState == LoginState.LoggedIn && loginMenu.Items.Count == 0)
+                if (authManager.LoginState == LoginState.LoggedIn)
                 {
-                    loginMenu.Items.Add(logoutOption);
+                    if(loginMenu.Items.Count == 0)
+                    {
+                        loginMenu.Items.Add(logoutOption);
+                    }
                 }
                 else
                 {