diff --git a/Source/Editor/Windows/ContentWindow.ContextMenu.cs b/Source/Editor/Windows/ContentWindow.ContextMenu.cs
index 03873df57..56136cfbf 100644
--- a/Source/Editor/Windows/ContentWindow.ContextMenu.cs
+++ b/Source/Editor/Windows/ContentWindow.ContextMenu.cs
@@ -2,6 +2,7 @@
 
 using System;
 using System.IO;
+using System.Linq;
 using FlaxEditor.Content;
 using FlaxEditor.GUI.ContextMenu;
 using FlaxEditor.Scripting;
@@ -249,6 +250,10 @@ namespace FlaxEditor.Windows
                 });
             }
 
+            // Remove any leftover separator
+            if (cm.ItemsContainer.Children.LastOrDefault() is ContextMenuSeparator)
+                cm.ItemsContainer.Children.Last().Dispose();
+
             // Show it
             cm.Show(this, location);
         }