diff --git a/src/modules/Workspaces/WorkspacesEditor/ViewModels/MainViewModel.cs b/src/modules/Workspaces/WorkspacesEditor/ViewModels/MainViewModel.cs
index 5d5440aea9..a85f291efc 100644
--- a/src/modules/Workspaces/WorkspacesEditor/ViewModels/MainViewModel.cs
+++ b/src/modules/Workspaces/WorkspacesEditor/ViewModels/MainViewModel.cs
@@ -171,6 +171,11 @@ namespace WorkspacesEditor.ViewModels
         {
             SendEditTelemetryEvent(projectToSave, editedProject);
 
+            if (editedProject.Name != projectToSave.Name)
+            {
+                RemoveShortcut(editedProject);
+            }
+
             editedProject.Name = projectToSave.Name;
             editedProject.IsShortcutNeeded = projectToSave.IsShortcutNeeded;
             editedProject.MoveExistingWindows = projectToSave.MoveExistingWindows;