diff --git a/app/src/main/kotlin/com/simplemobiletools/applauncher/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/applauncher/activities/MainActivity.kt
index 5031548..87940d4 100644
--- a/app/src/main/kotlin/com/simplemobiletools/applauncher/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/applauncher/activities/MainActivity.kt
@@ -110,7 +110,9 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener {
             val launchIntent = packageManager.getLaunchIntentForPackage((it as AppLauncher).packageName)
             if (launchIntent != null) {
                 startActivity(launchIntent)
-                finish()
+                if (config.closeApp) {
+                    finish()
+                }
             } else {
                 val url = "https://play.google.com/store/apps/details?id=${it.packageName}"
                 val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
diff --git a/app/src/main/kotlin/com/simplemobiletools/applauncher/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/applauncher/activities/SettingsActivity.kt
index 0eca055..f8621e3 100644
--- a/app/src/main/kotlin/com/simplemobiletools/applauncher/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/applauncher/activities/SettingsActivity.kt
@@ -22,6 +22,7 @@ class SettingsActivity : SimpleActivity() {
         setupUseEnglish()
         setupAvoidWhatsNew()
         setupShowInfoBubble()
+        setupCloseApp()
         updateTextColors(settings_holder)
     }
 
@@ -56,4 +57,12 @@ class SettingsActivity : SimpleActivity() {
             config.showInfoBubble = settings_show_info_bubble.isChecked
         }
     }
+
+    private fun setupCloseApp() {
+        settings_close_app.isChecked = config.closeApp
+        settings_close_app_holder.setOnClickListener {
+            settings_close_app.toggle()
+            config.closeApp = settings_close_app.isChecked
+        }
+    }
 }
diff --git a/app/src/main/kotlin/com/simplemobiletools/applauncher/helpers/Config.kt b/app/src/main/kotlin/com/simplemobiletools/applauncher/helpers/Config.kt
index 9282290..8a8301f 100644
--- a/app/src/main/kotlin/com/simplemobiletools/applauncher/helpers/Config.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/applauncher/helpers/Config.kt
@@ -11,4 +11,8 @@ class Config(context: Context) : BaseConfig(context) {
     var wasRemoveInfoShown: Boolean
         get() = prefs.getBoolean(WAS_REMOVE_INFO_SHOWN, false)
         set(wasRemoveInfoShown) = prefs.edit().putBoolean(WAS_REMOVE_INFO_SHOWN, wasRemoveInfoShown).apply()
+
+    var closeApp: Boolean
+        get() = prefs.getBoolean(CLOSE_APP, true)
+        set(closeApp) = prefs.edit().putBoolean(CLOSE_APP, closeApp).apply()
 }
diff --git a/app/src/main/kotlin/com/simplemobiletools/applauncher/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/applauncher/helpers/Constants.kt
index f7dfe22..dcf3b82 100644
--- a/app/src/main/kotlin/com/simplemobiletools/applauncher/helpers/Constants.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/applauncher/helpers/Constants.kt
@@ -1,6 +1,7 @@
 package com.simplemobiletools.applauncher.helpers
 
 const val WAS_REMOVE_INFO_SHOWN = "was_remove_info_shown"
+const val CLOSE_APP = "close_app"
 
 val predefinedPackageNames = arrayListOf(
         "com.simplemobiletools.calculator",
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index ce843ff..a8cdbd2 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -95,5 +95,28 @@
                 android:text="@string/show_info_bubble"/>
 
         </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/settings_close_app_holder"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/medium_margin"
+            android:background="?attr/selectableItemBackground"
+            android:paddingBottom="@dimen/activity_margin"
+            android:paddingLeft="@dimen/normal_margin"
+            android:paddingRight="@dimen/normal_margin"
+            android:paddingTop="@dimen/activity_margin">
+
+            <com.simplemobiletools.commons.views.MySwitchCompat
+                android:id="@+id/settings_close_app"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@null"
+                android:clickable="false"
+                android:paddingLeft="@dimen/medium_margin"
+                android:paddingStart="@dimen/medium_margin"
+                android:text="@string/close_app"/>
+
+        </RelativeLayout>
     </LinearLayout>
 </ScrollView>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index a4545a5..bcfc913 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -3,6 +3,7 @@
     <string name="app_launcher_name">مشغل التطبيق</string>
     <string name="enter_launcher_name">الرجاء ادراج اسم للإختصار</string>
     <string name="remove_explanation">هذا سيقوم بحذف الايقونة فقط من الواجهة الحالية,ولن يقوم بإلغاء تثبيت حزمة التطبيق.</string>
+    <string name="close_app">Close this app at launching a different one</string>
 
     <!-- Apps -->
     <string name="calculator">الحاسبة</string>
diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml
index d8aee25..96072aa 100644
--- a/app/src/main/res/values-az/strings.xml
+++ b/app/src/main/res/values-az/strings.xml
@@ -3,6 +3,7 @@
     <string name="app_launcher_name">Tətbiq Başladıcı</string>
     <string name="enter_launcher_name">Başladıcı adı daxil edin</string>
     <string name="remove_explanation">Bu proses yalnız tətbiq ikonunu siyahıdan siləcək, tətbiqin özü silinməyəcək.</string>
+    <string name="close_app">Close this app at launching a different one</string>
 
     <!-- Apps -->
     <string name="calculator">Kalkulyator</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 1d5a561..d3806e2 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -3,6 +3,7 @@
     <string name="app_launcher_name">App-Launcher</string>
     <string name="enter_launcher_name">Bitte gib einen Namen für die Verknüpfung ein</string>
     <string name="remove_explanation">Diese Aktion wird das App-Icon nur aus dem Raster löschen, nicht die eigentliche App deinstallieren.</string>
+    <string name="close_app">Close this app at launching a different one</string>
 
     <!-- Apps -->
     <string name="calculator">Rechner</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index ea10508..6f800fc 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -3,6 +3,7 @@
     <string name="app_launcher_name">Εκκινητής Εφαρμογών_αποσφαλμάτωση</string>
     <string name="enter_launcher_name">Παρακαλώ εισήγαγε ένα όνομα εκκινητή</string>
     <string name="remove_explanation">Αυτό, απλά, θα αφαιρέσει το εικονίδιο εκκίνησης από αυτό το πλαίσιο. Δεν θα απεγκαταστήσει την ίδια την εφαρμογή.</string>
+    <string name="close_app">Close this app at launching a different one</string>
 
     <!-- Apps -->
     <string name="calculator">Αριθμομηχανή</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index a17c1c6..411f2fe 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -3,6 +3,7 @@
     <string name="app_launcher_name">Lanzador de aplicaciones</string>
     <string name="enter_launcher_name">Por favor, introduzca un nombre para el lanzador</string>
     <string name="remove_explanation">This will just remove the launcher icon from this grid, not uninstall the actual app.</string>
+    <string name="close_app">Close this app at launching a different one</string>
 
     <!-- Apps -->
     <string name="calculator">Calculadora</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 64f1d56..873cc61 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -3,6 +3,7 @@
     <string name="app_launcher_name">App Launcher</string>
     <string name="enter_launcher_name">Veuillez entrer un nom de launcher</string>
     <string name="remove_explanation">Cette action ne fera que supprimer l\'icône du launcher de cette liste et ne désinstallere pas l\'application.</string>
+    <string name="close_app">Close this app at launching a different one</string>
 
     <!-- Apps -->
     <string name="calculator">Calculatrice</string>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index af113fa..dc25e99 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -3,6 +3,7 @@
     <string name="app_launcher_name">Pokretač aplikacija</string>
     <string name="enter_launcher_name">Unesite naziv pokretača</string>
     <string name="remove_explanation">To će ukloniti ikonu pokretača samo iz mreže, ali ne i deinstalirati aplikaciju.</string>
+    <string name="close_app">Close this app at launching a different one</string>
 
     <!-- Apps -->
     <string name="calculator">Kalkulator</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 86f43a9..9b0347c 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -3,6 +3,7 @@
     <string name="app_launcher_name">アプリ ランチャー</string>
     <string name="enter_launcher_name">ランチャーの名前を入力してください</string>
     <string name="remove_explanation">This will just remove the launcher icon from this grid, not uninstall the actual app.</string>
+    <string name="close_app">Close this app at launching a different one</string>
 
     <!-- Apps -->
     <string name="calculator">電卓</string>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index 44a6b40..8a8d445 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -3,6 +3,7 @@
     <string name="app_launcher_name">Paleidimo priemonė</string>
     <string name="enter_launcher_name">Prašome įvesti paleidimo priemonės pavadinimą</string>
     <string name="remove_explanation">Tai tik pašalins paleidimo priemonės ikonėlę iš tinklelio, nepašalins pačios programėlės.</string>
+    <string name="close_app">Close this app at launching a different one</string>
 
     <!-- Apps -->
     <string name="calculator">Skaičiuotuvas</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 0867603..fc8ad73 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -3,6 +3,7 @@
     <string name="app_launcher_name">Launcher Aplikacji</string>
     <string name="enter_launcher_name">Proszę wpisać nazwę launchera</string>
     <string name="remove_explanation">This will just remove the launcher icon from this grid, not uninstall the actual app.</string>
+    <string name="close_app">Close this app at launching a different one</string>
 
     <!-- Apps -->
     <string name="calculator">Kalkulator</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index e10b9cd..9b0f7e7 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -3,6 +3,7 @@
     <string name="app_launcher_name">Lançador de aplicações</string>
     <string name="enter_launcher_name">Por favor digite um nome para o lançador</string>
     <string name="remove_explanation">Esta ação remove o ícone da grelha mas não desinstala a aplicação.</string>
+    <string name="close_app">Close this app at launching a different one</string>
 
     <!-- Apps -->
     <string name="calculator">Calculadora</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 87ad2c8..3a17c17 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -3,6 +3,7 @@
     <string name="app_launcher_name">Лаунчер</string>
     <string name="enter_launcher_name">Пожалуйста, введите название лаунчера</string>
     <string name="remove_explanation">Это только удалит иконку лаунчера с сетки, но не удалит само приложение.</string>
+    <string name="close_app">Close this app at launching a different one</string>
 
     <!-- Apps -->
     <string name="calculator">Калькулятор</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 4bef09f..ddd47c8 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -3,6 +3,7 @@
     <string name="app_launcher_name">Spúšťač aplikácií</string>
     <string name="enter_launcher_name">Prosím zadajte názov pre spúšťač</string>
     <string name="remove_explanation">Toto iba odstráni spúšťačku z tejto mriežky, neodinštaluje to samotnú apku.</string>
+    <string name="close_app">Ukončiť túto aplikáciu pri spustení inej</string>
 
     <!-- Apps -->
     <string name="calculator">Kalkulačka</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 350ebd3..a97e56b 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -3,6 +3,7 @@
     <string name="app_launcher_name">簡易應用程式啟動器</string>
     <string name="enter_launcher_name">請輸入啟動器名稱</string>
     <string name="remove_explanation">這只會從畫面移除啟動器圖標，不會解除安裝實際程式。</string>
+    <string name="close_app">Close this app at launching a different one</string>
 
     <!-- Apps -->
     <string name="calculator">計算機</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 01c042e..c28d013 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3,6 +3,7 @@
     <string name="app_launcher_name">App Launcher</string>
     <string name="enter_launcher_name">Please enter a launcher name</string>
     <string name="remove_explanation">This will just remove the launcher icon from this grid, not uninstall the actual app.</string>
+    <string name="close_app">Close this app at launching a different one</string>
 
     <!-- Apps -->
     <string name="calculator">Calculator</string>