diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/activities/DialerActivity.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/activities/DialerActivity.kt
index 6a83afdd..9707b419 100644
--- a/app/src/main/kotlin/com/simplemobiletools/dialer/activities/DialerActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/dialer/activities/DialerActivity.kt
@@ -8,10 +8,7 @@ import android.provider.Settings
 import android.telecom.TelecomManager
 import android.view.Menu
 import android.widget.Toast
-import com.simplemobiletools.commons.extensions.isDefaultDialer
-import com.simplemobiletools.commons.extensions.showErrorToast
-import com.simplemobiletools.commons.extensions.telecomManager
-import com.simplemobiletools.commons.extensions.toast
+import com.simplemobiletools.commons.extensions.*
 import com.simplemobiletools.commons.helpers.REQUEST_CODE_SET_DEFAULT_DIALER
 import com.simplemobiletools.dialer.R
 import com.simplemobiletools.dialer.extensions.getHandleToUse
@@ -67,6 +64,7 @@ class DialerActivity : SimpleActivity() {
         if (requestCode == REQUEST_CODE_SET_DEFAULT_DIALER) {
             if (!isDefaultDialer()) {
                 try {
+                    hideKeyboard()
                     Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS).apply {
                         data = Uri.parse("package:$packageName")
                         startActivity(this)
diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/activities/MainActivity.kt
index 7e6b65a4..505ba054 100644
--- a/app/src/main/kotlin/com/simplemobiletools/dialer/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/dialer/activities/MainActivity.kt
@@ -129,7 +129,7 @@ class MainActivity : SimpleActivity() {
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
             R.id.clear_call_history -> clearCallHistory()
-            R.id.settings -> startActivity(Intent(applicationContext, SettingsActivity::class.java))
+            R.id.settings -> launchSettings()
             R.id.about -> launchAbout()
             else -> return super.onOptionsItemSelected(item)
         }
@@ -424,6 +424,11 @@ class MainActivity : SimpleActivity() {
         }
     }
 
+    private fun launchSettings() {
+        hideKeyboard()
+        startActivity(Intent(applicationContext, SettingsActivity::class.java))
+    }
+
     private fun launchAbout() {
         val licenses = LICENSE_GLIDE or LICENSE_INDICATOR_FAST_SCROLL