diff --git a/src/com/android/settings/accounts/RemoveAccountPreferenceController.java b/src/com/android/settings/accounts/RemoveAccountPreferenceController.java
index 60faab932f9..7003eed252b 100644
--- a/src/com/android/settings/accounts/RemoveAccountPreferenceController.java
+++ b/src/com/android/settings/accounts/RemoveAccountPreferenceController.java
@@ -180,10 +180,11 @@ public class RemoveAccountPreferenceController extends AbstractPreferenceControl
                                 | AuthenticatorException e) {
                             // handled below
                             Log.w(TAG, "Remove account error: " + e);
-                            RemoveAccountFailureDialog.show(getTargetFragment());
                         }
                         Log.i(TAG, "failed: " + failed);
-                        if (!failed) {
+                        if (failed) {
+                            RemoveAccountFailureDialog.show(getTargetFragment());
+                        } else {
                             targetActivity.finish();
                         }
                     }, null, mUserHandle);