diff --git a/Source/Editor/Viewport/EditorViewport.cs b/Source/Editor/Viewport/EditorViewport.cs
index 68e0723b0..3ca66c343 100644
--- a/Source/Editor/Viewport/EditorViewport.cs
+++ b/Source/Editor/Viewport/EditorViewport.cs
@@ -970,6 +970,15 @@ namespace FlaxEditor.Viewport
 
                 ViewWidgetButtonMenu.AddSeparator();
 
+                // Clear Debug Draw
+                {
+                    var button = ViewWidgetButtonMenu.AddButton("Clear Debug Draw");
+                    button.CloseMenuOnClick = false;
+                    button.Clicked += () => DebugDraw.Clear();
+                }
+
+                ViewWidgetButtonMenu.AddSeparator();
+
                 // Brightness
                 {
                     var brightness = ViewWidgetButtonMenu.AddButton("Brightness");
diff --git a/Source/Editor/Windows/GameWindow.cs b/Source/Editor/Windows/GameWindow.cs
index 5bff8db69..b7a17214b 100644
--- a/Source/Editor/Windows/GameWindow.cs
+++ b/Source/Editor/Windows/GameWindow.cs
@@ -695,6 +695,13 @@ namespace FlaxEditor.Windows
                 slider.ValueChanged += () => AudioVolume = slider.Value;
             }
 
+            // Debug Draw Clear
+            {
+                var button = menu.AddButton("Clear Debug Draw");
+                button.CloseMenuOnClick = false;
+                button.Clicked += () => DebugDraw.Clear();
+            }
+
             menu.MinimumWidth = 200;
             menu.AddSeparator();
         }