diff --git a/src/main/java/de/bixilon/minosoft/gui/eros/dialog/connection/ConnectingDialog.kt b/src/main/java/de/bixilon/minosoft/gui/eros/dialog/connection/ConnectingDialog.kt
index e3357fc97..b0444c9b0 100644
--- a/src/main/java/de/bixilon/minosoft/gui/eros/dialog/connection/ConnectingDialog.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/eros/dialog/connection/ConnectingDialog.kt
@@ -20,6 +20,7 @@ import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
 import de.bixilon.minosoft.protocol.network.connection.play.PlayConnectionStates
 import de.bixilon.minosoft.util.KUtil.toResourceLocation
 import de.bixilon.minosoft.util.delegate.JavaFXDelegate.observeFX
+import javafx.event.EventHandler
 import javafx.fxml.FXML
 import javafx.scene.control.Button
 import javafx.scene.control.ProgressBar
@@ -41,6 +42,9 @@ class ConnectingDialog(
     override fun init() {
         headerFX.text = HEADER
         cancelButtonFX.isDisable = true
+        stage.onCloseRequest = EventHandler {
+            it.consume()
+        }
         connection::state.observeFX(this) { update(it) }
     }
 
diff --git a/src/main/java/de/bixilon/minosoft/gui/eros/dialog/progress/ProgressDialog.kt b/src/main/java/de/bixilon/minosoft/gui/eros/dialog/progress/ProgressDialog.kt
index 707df2a39..dfeff1b4e 100644
--- a/src/main/java/de/bixilon/minosoft/gui/eros/dialog/progress/ProgressDialog.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/eros/dialog/progress/ProgressDialog.kt
@@ -20,6 +20,7 @@ import de.bixilon.minosoft.gui.eros.controller.DialogController
 import de.bixilon.minosoft.gui.eros.util.JavaFXUtil
 import de.bixilon.minosoft.gui.eros.util.JavaFXUtil.text
 import de.bixilon.minosoft.util.KUtil.toResourceLocation
+import javafx.event.EventHandler
 import javafx.fxml.FXML
 import javafx.scene.control.Button
 import javafx.scene.control.ProgressBar
@@ -52,6 +53,12 @@ open class ProgressDialog(
     override fun init() {
         headerFX.text = header
         cancelButtonFX.isDisable = onCancel == null
+
+        if (onCancel == null) {
+            stage.onCloseRequest = EventHandler {
+                it.consume()
+            }
+        }
     }
 
     private fun update() {