diff --git a/app/src/main/java/info/nightscout/androidaps/MainActivity.java b/app/src/main/java/info/nightscout/androidaps/MainActivity.java
index adc4cf5a027..06b78dbe1a5 100644
--- a/app/src/main/java/info/nightscout/androidaps/MainActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/MainActivity.java
@@ -432,9 +432,8 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 MainApp.instance().stopKeepAliveService();
                 MainApp.bus().post(new EventAppExit());
                 MainApp.closeDbHelper();
-                finish();
+                finishAndRemoveTask();
                 System.runFinalization();
-                System.exit(0);
                 return true;
             case R.id.nav_plugin_preferences:
                 ViewPager viewPager = findViewById(R.id.pager);