diff --git a/Editor/ForceFieldWindow.cpp b/Editor/ForceFieldWindow.cpp
index 6d27513e3..15b5b7476 100644
--- a/Editor/ForceFieldWindow.cpp
+++ b/Editor/ForceFieldWindow.cpp
@@ -101,6 +101,9 @@ ForceFieldWindow::ForceFieldWindow(wiGUI* gui) : GUI(gui)
 
 ForceFieldWindow::~ForceFieldWindow()
 {
+	forceFieldWindow->RemoveWidgets(true);
+	GUI->RemoveWidget(forceFieldWindow);
+	SAFE_DELETE(forceFieldWindow);
 }
 
 void ForceFieldWindow::SetEntity(Entity entity)