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