diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/floating/FloatyWindowManger.java b/app/src/main/java/com/stardust/scriptdroid/ui/floating/FloatyWindowManger.java
index 874238f6..5fd30cc4 100644
--- a/app/src/main/java/com/stardust/scriptdroid/ui/floating/FloatyWindowManger.java
+++ b/app/src/main/java/com/stardust/scriptdroid/ui/floating/FloatyWindowManger.java
@@ -51,12 +51,10 @@ public class FloatyWindowManger {
         }
     }
 
-
     public static void closeWindow(FloatyWindow window) {
         window.close();
     }
 
-
     public static boolean isCircularMenuShowing() {
         return sCircularMenu != null && sCircularMenu.get() != null;
     }
@@ -76,7 +74,8 @@ public class FloatyWindowManger {
         if (sCircularMenu == null)
             return;
         CircularMenu menu = sCircularMenu.get();
-        menu.close();
+        if (menu != null)
+            menu.close();
         sCircularMenu = null;
     }
 }