diff --git a/app/src/main/java/com/todoroo/astrid/activity/MainActivity.kt b/app/src/main/java/com/todoroo/astrid/activity/MainActivity.kt
index e44666f70..e5014bd66 100644
--- a/app/src/main/java/com/todoroo/astrid/activity/MainActivity.kt
+++ b/app/src/main/java/com/todoroo/astrid/activity/MainActivity.kt
@@ -278,7 +278,7 @@ class MainActivity : InjectingAppCompatActivity(), TaskListFragmentCallbackHandl
                             binding.detail.visibility = View.GONE
                         }
                     }
-                    .commitNow()
+                    .commit()
         }
     }
 
@@ -310,7 +310,7 @@ class MainActivity : InjectingAppCompatActivity(), TaskListFragmentCallbackHandl
         supportFragmentManager
                 .beginTransaction()
                 .replace(R.id.master, taskListFragment, FRAG_TAG_TASK_LIST)
-                .commitNow()
+                .commitNowAllowingStateLoss()
     }
 
     private fun applyTheme() {