diff --git a/src/main/java/dev/isxander/controlify/gui/screen/ControllerDeadzoneCalibrationScreen.java b/src/main/java/dev/isxander/controlify/gui/screen/ControllerDeadzoneCalibrationScreen.java
index 22c5654..cdd222c 100644
--- a/src/main/java/dev/isxander/controlify/gui/screen/ControllerDeadzoneCalibrationScreen.java
+++ b/src/main/java/dev/isxander/controlify/gui/screen/ControllerDeadzoneCalibrationScreen.java
@@ -96,6 +96,11 @@ public class ControllerDeadzoneCalibrationScreen extends Screen {
 
     @Override
     public void tick() {
+        if (!ControllerManager.isControllerConnected(controller.uid())) {
+            onClose();
+            return;
+        }
+
         if (!calibrating)
             return;