diff --git a/mix/qml/DeploymentDialog.qml b/mix/qml/DeploymentDialog.qml
index c4f94630d..88dfb90b2 100644
--- a/mix/qml/DeploymentDialog.qml
+++ b/mix/qml/DeploymentDialog.qml
@@ -66,9 +66,12 @@ Window {
 		anchors.bottomMargin: 10
 		Button {
 			text: qsTr("Deploy");
-			enabled: Object.keys(projectModel.deploymentAddresses).length === 0
+			enabled: applicationUrlHttp.text !== ""
 			onClicked: {
-				ProjectModelCode.startDeployProject();
+				if (Object.keys(projectModel.deploymentAddresses).length > 0)
+					deployWarningDialog.open();
+				else
+					ProjectModelCode.startDeployProject();
 			}
 		}
 
diff --git a/mix/qml/ProjectModel.qml b/mix/qml/ProjectModel.qml
index 435d0342c..d1767ea5b 100644
--- a/mix/qml/ProjectModel.qml
+++ b/mix/qml/ProjectModel.qml
@@ -96,7 +96,7 @@ Item {
 		standardButtons: StandardButton.Ok | StandardButton.Cancel
 		icon: StandardIcon.Question
 		onAccepted: {
-			ProjectModelCode.deployProject(true);
+			ProjectModelCode.startDeployProject();
 		}
 	}
 
diff --git a/mix/qml/js/ProjectModel.js b/mix/qml/js/ProjectModel.js
index aa0ed723c..0af32c083 100644
--- a/mix/qml/js/ProjectModel.js
+++ b/mix/qml/js/ProjectModel.js
@@ -281,14 +281,7 @@ function generateFileName(name, extension) {
 
 var jsonRpcRequestId = 1;
 function deployProject(force) {
-
 	saveAll(); //TODO: ask user
-
-	/*if (!force && deploymentAddresses !== []) {
-		deployWarningDialog.visible = true;
-		return;
-	}*/
-
 	deploymentDialog.open();
 }