diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AbsTagEditorActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AbsTagEditorActivity.java
index dea2f01b..b9596d7b 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AbsTagEditorActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/tageditor/AbsTagEditorActivity.java
@@ -382,13 +382,14 @@ public abstract class AbsTagEditorActivity extends AbsBaseActivity {
                     public void run() {
                         if (i == 0 || i == toBeScannedLength - 1) {
                             App.bus.post(new DataBaseChangedEvent(DataBaseChangedEvent.DATABASE_CHANGED));
+                            if (i == toBeScannedLength - 1)
+                                finish();
                         }
                         i++;
                     }
                 });
             }
         });
-        finish();
     }
 
     protected int getId() {