diff --git a/src/save/ServerSaveActivity.cpp b/src/save/ServerSaveActivity.cpp
index d336ea17d..eda807bc9 100644
--- a/src/save/ServerSaveActivity.cpp
+++ b/src/save/ServerSaveActivity.cpp
@@ -174,8 +174,8 @@ void ServerSaveActivity::Save()
 		virtual void ConfirmCallback(ConfirmPrompt::DialogueResult result) {
 			if (result == ConfirmPrompt::ResultOkay)
 			{
-				a->saveUpload();
 				a->Exit();
+				a->saveUpload();
 			}
 		}
 		virtual ~PublishConfirmation() { }
@@ -189,8 +189,8 @@ void ServerSaveActivity::Save()
 		}
 		else
 		{
-			saveUpload();
 			Exit();
+			saveUpload();
 		}
 	}
 	else
diff --git a/src/tasks/TaskWindow.cpp b/src/tasks/TaskWindow.cpp
index 7a1c544c3..b3055d1fe 100644
--- a/src/tasks/TaskWindow.cpp
+++ b/src/tasks/TaskWindow.cpp
@@ -60,7 +60,7 @@ void TaskWindow::Exit()
 	if(ui::Engine::Ref().GetWindow()==this)
 	{
 		ui::Engine::Ref().CloseWindow();
-		delete this;
+		SelfDestruct();
 	}
 }