diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
index 114427cc2..a4156b4cc 100755
--- a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
@@ -501,7 +501,8 @@ public final class TaskEditActivity extends TabActivity {
         if(!onPause && peopleControlSet != null && !peopleControlSet.saveSharingSettings(processedToast))
             return;
 
-        finish();
+        if (!onPause) // Saving during on pause could cause a double finish
+            finish();
     }
 
     @Override