diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DashboardFragment.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DashboardFragment.java
index 16ea40061..6e520a320 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DashboardFragment.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DashboardFragment.java
@@ -315,7 +315,7 @@ public class DashboardFragment extends Fragment implements MenuProvider {
         getChildFragmentManager()
                 .beginTransaction()
                 .replace(fragmentId, widgetObj)
-                .commit();
+                .commitAllowingStateLoss(); // FIXME: #4007
 
         GridLayout.LayoutParams layoutParams = new GridLayout.LayoutParams(
                 GridLayout.spec(GridLayout.UNDEFINED, GridLayout.FILL, 1f),