diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/CircadianPercentageProfile/CircadianPercentageProfileFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/CircadianPercentageProfile/CircadianPercentageProfileFragment.java
index 0bf490abb6..a9afb13bbb 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/CircadianPercentageProfile/CircadianPercentageProfileFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/CircadianPercentageProfile/CircadianPercentageProfileFragment.java
@@ -344,6 +344,12 @@ public class CircadianPercentageProfileFragment extends Fragment implements Frag
     @Override
     public void onPause() {
         super.onPause();
+
+        if (basalEditDialog != null && basalEditDialog.isVisible()) {
+            basalEditDialog.dismiss();
+        }
+        basalEditDialog = null;
+
         MainApp.bus().unregister(this);
     }