diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitScreen.java b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitScreen.java
index a929d25b9..c74b412da 100644
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitScreen.java
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitScreen.java
@@ -26,8 +26,8 @@ import org.isoron.uhabits.*;
 import org.isoron.uhabits.activities.common.dialogs.*;
 import org.isoron.uhabits.activities.habits.edit.*;
 import org.isoron.uhabits.core.models.*;
+import org.isoron.uhabits.core.ui.callbacks.*;
 import org.isoron.uhabits.core.ui.screens.habits.show.*;
-import org.isoron.uhabits.core.ui.callbacks.OnConfirmedCallback;
 
 import javax.inject.*;
 
@@ -56,19 +56,18 @@ public class ShowHabitScreen extends BaseScreen
                            @NonNull Habit habit,
                            @NonNull ShowHabitRootView view,
                            @NonNull ShowHabitsMenu menu,
-                           @NonNull
-                                   EditHabitDialogFactory editHabitDialogFactory,
+                           @NonNull EditHabitDialogFactory editHabitDialogFactory,
                            @NonNull ConfirmDeleteDialogFactory confirmDeleteDialogFactory,
                            @NonNull Lazy<ShowHabitBehavior> behavior)
     {
         super(activity);
-        this.confirmDeleteDialogFactory = confirmDeleteDialogFactory;
         setMenu(menu);
         setRootView(view);
 
         this.habit = habit;
         this.behavior = behavior;
         this.editHabitDialogFactory = editHabitDialogFactory;
+        this.confirmDeleteDialogFactory = confirmDeleteDialogFactory;
         view.setController(this);
     }
 
@@ -122,18 +121,19 @@ public class ShowHabitScreen extends BaseScreen
         {
             case COULD_NOT_EXPORT:
                 showMessage(R.string.could_not_export);
+
             case HABIT_DELETED:
                 showMessage(R.string.delete_habits_message);
         }
     }
 
     @Override
-    public void showDeleteConfirmationScreen(OnConfirmedCallback callback) {
+    public void showDeleteConfirmationScreen(@NonNull OnConfirmedCallback callback) {
         activity.showDialog(confirmDeleteDialogFactory.create(callback));
     }
 
     @Override
-    public void endActivity() {
+    public void close() {
         activity.finish();
     }
 }
diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabitMenuBehavior.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabitMenuBehavior.java
index 4a70c7b79..ad426f528 100644
--- a/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabitMenuBehavior.java
+++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/ui/screens/habits/show/ShowHabitMenuBehavior.java
@@ -21,11 +21,10 @@ package org.isoron.uhabits.core.ui.screens.habits.show;
 
 import android.support.annotation.*;
 
-import org.isoron.uhabits.core.commands.CommandRunner;
-import org.isoron.uhabits.core.commands.DeleteHabitsCommand;
+import org.isoron.uhabits.core.commands.*;
 import org.isoron.uhabits.core.models.*;
 import org.isoron.uhabits.core.tasks.*;
-import org.isoron.uhabits.core.ui.callbacks.OnConfirmedCallback;
+import org.isoron.uhabits.core.ui.callbacks.*;
 
 import java.io.*;
 import java.util.*;
@@ -92,8 +91,7 @@ public class ShowHabitMenuBehavior
         screen.showDeleteConfirmationScreen(() -> {
             commandRunner.execute(new DeleteHabitsCommand(habitList, selected),
                     null);
-            screen.showMessage(Message.HABIT_DELETED);
-            screen.endActivity();
+            screen.close();
         });
     }
 
@@ -113,7 +111,7 @@ public class ShowHabitMenuBehavior
         void showDeleteConfirmationScreen(
                 @NonNull OnConfirmedCallback callback);
 
-        void endActivity();
+        void close();
     }
 
     public interface System