diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ControlCenter.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ControlCenter.java
index 0ce5a4268..6a97fe90f 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ControlCenter.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ControlCenter.java
@@ -170,8 +170,10 @@ public class ControlCenter extends Activity {
             menu.removeItem(R.id.controlcenter_take_screenshot);
         }
 
-        if (!selectedDevice.isConnected()) {
+        if (selectedDevice.getState() == GBDevice.State.NOT_CONNECTED) {
             menu.removeItem(R.id.controlcenter_disconnect);
+        }
+        if (!selectedDevice.isInitialized()) {
             menu.removeItem(R.id.controlcenter_find_device);
         }