diff --git a/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java b/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
index b92765cce..18004c204 100644
--- a/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
+++ b/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
@@ -754,7 +754,7 @@ public final class TaskListFragment extends InjectingFragment
         (singleFilter == null
                 ? newRemoteListSupportPicker(this, REQUEST_MOVE_TASKS)
                 : newRemoteListSupportPicker(singleFilter, this, REQUEST_MOVE_TASKS))
-            .show(getFragmentManager(), FRAG_TAG_REMOTE_LIST_PICKER);
+            .show(getParentFragmentManager(), FRAG_TAG_REMOTE_LIST_PICKER);
         return true;
       case R.id.menu_select_all:
         taskAdapter.setSelected(
diff --git a/app/src/main/java/com/todoroo/astrid/files/FilesControlSet.java b/app/src/main/java/com/todoroo/astrid/files/FilesControlSet.java
index 1511ef2bb..583e5cfa9 100644
--- a/app/src/main/java/com/todoroo/astrid/files/FilesControlSet.java
+++ b/app/src/main/java/com/todoroo/astrid/files/FilesControlSet.java
@@ -87,7 +87,7 @@ public class FilesControlSet extends TaskEditControlFragment {
 
   @OnClick(R.id.add_attachment)
   void addAttachment(View view) {
-    newAddAttachmentDialog(this).show(getFragmentManager(), FRAG_TAG_ADD_ATTACHMENT_DIALOG);
+    newAddAttachmentDialog(this).show(getParentFragmentManager(), FRAG_TAG_ADD_ATTACHMENT_DIALOG);
   }
 
   @Override
diff --git a/app/src/main/java/org/tasks/dialogs/AddAttachmentDialog.java b/app/src/main/java/org/tasks/dialogs/AddAttachmentDialog.java
index 18cfc8d26..75bca11c0 100644
--- a/app/src/main/java/org/tasks/dialogs/AddAttachmentDialog.java
+++ b/app/src/main/java/org/tasks/dialogs/AddAttachmentDialog.java
@@ -74,7 +74,7 @@ public class AddAttachmentDialog extends InjectingDialogFragment {
 
   private void recordNote() {
     newRecordAudioDialog((FilesControlSet) getTargetFragment(), REQUEST_AUDIO)
-        .show(getFragmentManager(), FRAG_TAG_RECORD_AUDIO);
+        .show(getParentFragmentManager(), FRAG_TAG_RECORD_AUDIO);
   }
 
   private void pickFromGallery() {
diff --git a/app/src/main/java/org/tasks/repeats/BasicRecurrenceDialog.java b/app/src/main/java/org/tasks/repeats/BasicRecurrenceDialog.java
index e6606ca1a..8a897bd78 100644
--- a/app/src/main/java/org/tasks/repeats/BasicRecurrenceDialog.java
+++ b/app/src/main/java/org/tasks/repeats/BasicRecurrenceDialog.java
@@ -115,7 +115,7 @@ public class BasicRecurrenceDialog extends InjectingDialogFragment {
                 result = null;
               } else if (i == 5) {
                 newCustomRecurrenceDialog((RepeatControlSet) getTargetFragment(), rrule, dueDate)
-                    .show(getFragmentManager(), FRAG_TAG_CUSTOM_RECURRENCE);
+                    .show(getParentFragmentManager(), FRAG_TAG_CUSTOM_RECURRENCE);
                 dialogInterface.dismiss();
                 return;
               } else {
diff --git a/app/src/main/java/org/tasks/ui/LocationControlSet.java b/app/src/main/java/org/tasks/ui/LocationControlSet.java
index d2a232fb9..997e76752 100644
--- a/app/src/main/java/org/tasks/ui/LocationControlSet.java
+++ b/app/src/main/java/org/tasks/ui/LocationControlSet.java
@@ -214,7 +214,7 @@ public class LocationControlSet extends TaskEditControlFragment {
   private void showGeofenceOptions() {
     GeofenceDialog dialog = newGeofenceDialog(location);
     dialog.setTargetFragment(this, REQUEST_GEOFENCE_DETAILS);
-    dialog.show(getFragmentManager(), FRAG_TAG_LOCATION_DIALOG);
+    dialog.show(getParentFragmentManager(), FRAG_TAG_LOCATION_DIALOG);
   }
 
   @Override
diff --git a/app/src/main/java/org/tasks/ui/RemoteListFragment.java b/app/src/main/java/org/tasks/ui/RemoteListFragment.java
index e19c49a7a..551709f87 100644
--- a/app/src/main/java/org/tasks/ui/RemoteListFragment.java
+++ b/app/src/main/java/org/tasks/ui/RemoteListFragment.java
@@ -162,7 +162,7 @@ public class RemoteListFragment extends TaskEditControlFragment {
 
   private void openPicker() {
     newRemoteListSupportPicker(selectedList, this, REQUEST_CODE_SELECT_LIST)
-        .show(getFragmentManager(), FRAG_TAG_GOOGLE_TASK_LIST_SELECTION);
+        .show(getParentFragmentManager(), FRAG_TAG_GOOGLE_TASK_LIST_SELECTION);
   }
 
   @Override