diff --git a/app/src/main/java/com/finnmglas/launcher/Functions.kt b/app/src/main/java/com/finnmglas/launcher/Functions.kt
index 24a7b74..2ccab3b 100644
--- a/app/src/main/java/com/finnmglas/launcher/Functions.kt
+++ b/app/src/main/java/com/finnmglas/launcher/Functions.kt
@@ -77,6 +77,7 @@ const val PREF_DATE_FORMAT = "dateFormat"
 
 const val PREF_DOUBLE_ACTIONS_ENABLED = "enableDoubleActions"
 const val PREF_SEARCH_AUTO_LAUNCH = "searchAutoLaunch"
+const val PREF_SEARCH_AUTO_KEYBOARD = "searchAutoKeyboard"
 
 const val PREF_SLIDE_SENSITIVITY = "slideSensitivity"
 
diff --git a/app/src/main/java/com/finnmglas/launcher/list/apps/ListFragmentApps.kt b/app/src/main/java/com/finnmglas/launcher/list/apps/ListFragmentApps.kt
index 0eb806f..88c2419 100644
--- a/app/src/main/java/com/finnmglas/launcher/list/apps/ListFragmentApps.kt
+++ b/app/src/main/java/com/finnmglas/launcher/list/apps/ListFragmentApps.kt
@@ -6,12 +6,9 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.finnmglas.launcher.R
-import com.finnmglas.launcher.UIObject
-import com.finnmglas.launcher.dominantColor
+import com.finnmglas.launcher.*
 import com.finnmglas.launcher.list.forApp
 import com.finnmglas.launcher.list.intention
-import com.finnmglas.launcher.openSoftKeyboard
 import kotlinx.android.synthetic.main.list.*
 import kotlinx.android.synthetic.main.list_apps.*
 
@@ -69,8 +66,8 @@ class ListFragmentApps : Fragment(), UIObject {
             }
         })
 
-        when (intention) {
-            "view" -> openSoftKeyboard(context!!, list_apps_searchview)
+        if (intention == "view" && launcherPreferences.getBoolean(PREF_SEARCH_AUTO_KEYBOARD, true)) {
+            openSoftKeyboard(context!!, list_apps_searchview)
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/finnmglas/launcher/settings/launcher/SettingsFragmentLauncher.kt b/app/src/main/java/com/finnmglas/launcher/settings/launcher/SettingsFragmentLauncher.kt
index f03e08b..78a168d 100644
--- a/app/src/main/java/com/finnmglas/launcher/settings/launcher/SettingsFragmentLauncher.kt
+++ b/app/src/main/java/com/finnmglas/launcher/settings/launcher/SettingsFragmentLauncher.kt
@@ -115,6 +115,7 @@ class SettingsFragmentLauncher : Fragment(), UIObject {
         setSwitchColor(settings_launcher_switch_screen_timeout, vibrantColor)
         setSwitchColor(settings_launcher_switch_screen_full, vibrantColor)
         setSwitchColor(settings_launcher_switch_auto_launch, vibrantColor)
+        setSwitchColor(settings_launcher_switch_auto_keyboard, vibrantColor)
         setSwitchColor(settings_launcher_switch_enable_double, vibrantColor)
 
         settings_launcher_container.setBackgroundColor(dominantColor)
@@ -150,6 +151,13 @@ class SettingsFragmentLauncher : Fragment(), UIObject {
                 .apply()
         }
 
+        settings_launcher_switch_auto_keyboard.isChecked = launcherPreferences.getBoolean(PREF_SEARCH_AUTO_KEYBOARD, true)
+        settings_launcher_switch_auto_keyboard.setOnCheckedChangeListener { _, isChecked -> // Toggle double actions
+            launcherPreferences.edit()
+                .putBoolean(PREF_SEARCH_AUTO_KEYBOARD, isChecked)
+                .apply()
+        }
+
         settings_launcher_switch_enable_double.isChecked = launcherPreferences.getBoolean(PREF_DOUBLE_ACTIONS_ENABLED, false)
         settings_launcher_switch_enable_double.setOnCheckedChangeListener { _, isChecked -> // Toggle double actions
             launcherPreferences.edit()
@@ -216,9 +224,7 @@ class SettingsFragmentLauncher : Fragment(), UIObject {
                     .apply()
             }
 
-            override fun onNothingSelected(parent: AdapterView<*>?) {
-
-            }
+            override fun onNothingSelected(parent: AdapterView<*>?) { }
         }
 
         // Load values into the theme spinner
@@ -246,10 +252,7 @@ class SettingsFragmentLauncher : Fragment(), UIObject {
                     2 -> if (getSavedTheme(activity!!) != "custom") resetToCustomTheme(activity!!)
                 }
             }
-
-            override fun onNothingSelected(parent: AdapterView<*>?) {
-
-            }
+            override fun onNothingSelected(parent: AdapterView<*>?) { }
         }
 
         settings_seekbar_sensitivity.progress = launcherPreferences.getInt(PREF_SLIDE_SENSITIVITY, 2) * 4 / 100
diff --git a/app/src/main/res/layout/settings_launcher.xml b/app/src/main/res/layout/settings_launcher.xml
index 1acf4a4..f56d6d2 100644
--- a/app/src/main/res/layout/settings_launcher.xml
+++ b/app/src/main/res/layout/settings_launcher.xml
@@ -246,6 +246,35 @@
 
     </LinearLayout>
 
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="16sp"
+        android:gravity="top"
+        android:orientation="horizontal"
+        android:paddingLeft="8sp">
+
+        <TextView
+            android:id="@+id/settings_launcher_text_start_keyboard"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/settings_launcher_auto_keyboard"
+            android:textSize="16sp" />
+
+        <Space
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+
+        <Switch
+            android:id="@+id/settings_launcher_switch_auto_keyboard"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:checked="false"
+            android:textSize="18sp" />
+
+    </LinearLayout>
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index b599429..23f96f6 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -79,6 +79,7 @@
 
     <string name="settings_launcher_enable_double">Doppelte Wischaktionen</string>
     <string name="settings_launcher_auto_launch">Suchergebisse launchen</string>
+    <string name="settings_launcher_auto_keyboard">Tastatur in Suche öffnen</string>
 
     <string name="settings_launcher_sensitivity">Empfindlichkeit</string>
 
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index df5f7d8..407f236 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -101,6 +101,7 @@
 
     <string name="settings_launcher_enable_double">Deslizar con dos dedos</string>
     <string name="settings_launcher_auto_launch">Auto-lanzar búsquedas</string>
+    <string name="settings_launcher_auto_keyboard">Abrir teclado en búsqueda</string>
 
     <string name="settings_launcher_sensitivity">Sensibilidad</string>
 
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 528349b..fa31887 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -79,6 +79,7 @@
 
     <string name="settings_launcher_enable_double">Double balayage actions</string>
     <string name="settings_launcher_auto_launch">Lancer apps par recherche</string>
+    <string name="settings_launcher_auto_keyboard">Ouvrir clavier en recherche</string>
 
     <string name="settings_launcher_sensitivity">Sensibilité</string>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5194c63..33099c2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -99,6 +99,7 @@
 
     <string name="settings_launcher_enable_double">Double swipe actions</string>
     <string name="settings_launcher_auto_launch">Launch search results</string>
+    <string name="settings_launcher_auto_keyboard">Start keyboard for search</string>
 
     <string name="settings_launcher_sensitivity">Sensitivity</string>