diff --git a/src/app/ModuleWidget.cpp b/src/app/ModuleWidget.cpp
index e48cc524..8e591ca8 100644
--- a/src/app/ModuleWidget.cpp
+++ b/src/app/ModuleWidget.cpp
@@ -159,6 +159,7 @@ Widget *ModuleWidget::onHoverKey(Vec pos, int key) {
 				gRackWidget->deleteModule(this);
 				this->finalizeEvents();
 				delete this;
+				return NULL;
 			}
 			break;
 		case GLFW_KEY_I:
diff --git a/src/app/RackWidget.cpp b/src/app/RackWidget.cpp
index 9873ceff..66bf21ba 100644
--- a/src/app/RackWidget.cpp
+++ b/src/app/RackWidget.cpp
@@ -45,6 +45,7 @@ void RackWidget::clear() {
 	activeWire = NULL;
 	wireContainer->clearChildren();
 	moduleContainer->clearChildren();
+	lastPath = "";
 }
 
 void RackWidget::openDialog() {
diff --git a/src/gui.cpp b/src/gui.cpp
index 20ffed29..1f7d6105 100644
--- a/src/gui.cpp
+++ b/src/gui.cpp
@@ -304,7 +304,7 @@ void guiRun() {
 
 		// Autosave every 15 seconds
 		if (gGuiFrame % (60*15) == 0) {
-			gRackWidget->savePatch("autosave.json");
+			gRackWidget->savePatch("autosave.vcv");
 			settingsSave("settings.json");
 		}