diff --git a/mix/qml/DeployContractStep.qml b/mix/qml/DeployContractStep.qml
index 882e6e30b..128aeede7 100644
--- a/mix/qml/DeployContractStep.qml
+++ b/mix/qml/DeployContractStep.qml
@@ -297,9 +297,9 @@ Rectangle {
 					Ether
 					{
 						id: gasPriceInput
-						displayUnitSelection: false
+						displayUnitSelection: true
 						displayFormattedValue: true
-						edit: false
+						edit: true
 
 						function toHexWei()
 						{
diff --git a/mix/qml/RegisteringStep.qml b/mix/qml/RegisteringStep.qml
index fa0320b90..61f7a562e 100644
--- a/mix/qml/RegisteringStep.qml
+++ b/mix/qml/RegisteringStep.qml
@@ -156,7 +156,7 @@ Rectangle {
 						NetworkDeploymentCode.checkPathCreationCost(applicationUrlEthCtrl.text, function(pathCreationCost)
 						{
 							var ether = QEtherHelper.createBigInt(pathCreationCost);
-							var gasTotal = ether.multiply(worker.gasPriceInt);
+							var gasTotal = ether.multiply(deploymentDialog.deployStep.gasPrice.value.toWei());
 							gasToUseDeployInput.value = QEtherHelper.createEther(gasTotal.value(), QEther.Wei, parent);
 							gasToUseDeployInput.update();
 						});
@@ -167,7 +167,7 @@ Rectangle {
 			Ether
 			{
 				id: gasToUseDeployInput
-				displayUnitSelection: true
+				displayUnitSelection: false
 				displayFormattedValue: true
 				edit: false
 				Layout.preferredWidth: 235