diff --git a/app/build.gradle b/app/build.gradle
index a4f765b1..134f318c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -62,7 +62,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.github.SimpleMobileTools:Simple-Commons:332725a9fc'
+    implementation 'com.github.SimpleMobileTools:Simple-Commons:02a57ef98a'
     implementation 'com.googlecode.ez-vcard:ez-vcard:0.11.3'
     implementation 'com.github.tibbi:IndicatorFastScroll:4524cd0b61'
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/EditContactActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/EditContactActivity.kt
index f0daaa2b..a80be0ed 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/EditContactActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/EditContactActivity.kt
@@ -90,11 +90,13 @@ class EditContactActivity : ContactActivity() {
                             initContact()
                         } else {
                             toast(R.string.no_contacts_permission)
+                            hideKeyboard()
                             finish()
                         }
                     }
                 } else {
                     toast(R.string.no_contacts_permission)
+                    hideKeyboard()
                     finish()
                 }
             }
@@ -140,6 +142,7 @@ class EditContactActivity : ContactActivity() {
                 contact = ContactsHelper(this).getContactWithId(contactId, intent.getBooleanExtra(IS_PRIVATE, false))
                 if (contact == null) {
                     toast(R.string.unknown_error_occurred)
+                    hideKeyboard()
                     finish()
                 } else {
                     runOnUiThread {
@@ -301,6 +304,7 @@ class EditContactActivity : ContactActivity() {
         }
 
         contact_toolbar.setNavigationOnClickListener {
+            hideKeyboard()
             finish()
         }
     }
@@ -1109,10 +1113,12 @@ class EditContactActivity : ContactActivity() {
                 contact!!.source = originalContactSource
                 ContactsHelper(this).deleteContact(contact!!, false) {
                     setResult(Activity.RESULT_OK)
+                    hideKeyboard()
                     finish()
                 }
             } else {
                 setResult(Activity.RESULT_OK)
+                hideKeyboard()
                 finish()
             }
         } else {
@@ -1124,6 +1130,7 @@ class EditContactActivity : ContactActivity() {
         isSaving = true
         if (ContactsHelper(this@EditContactActivity).updateContact(contact!!, photoUpdateStatus)) {
             setResult(Activity.RESULT_OK)
+            hideKeyboard()
             finish()
         } else {
             toast(R.string.unknown_error_occurred)
diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/ContactsFragment.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/ContactsFragment.kt
index 73816813..d3a89d86 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/ContactsFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/fragments/ContactsFragment.kt
@@ -3,12 +3,14 @@ package com.simplemobiletools.contacts.pro.fragments
 import android.content.Context
 import android.content.Intent
 import android.util.AttributeSet
+import com.simplemobiletools.commons.extensions.hideKeyboard
 import com.simplemobiletools.contacts.pro.activities.EditContactActivity
 import com.simplemobiletools.contacts.pro.activities.InsertOrEditContactActivity
 import com.simplemobiletools.contacts.pro.activities.MainActivity
 
 class ContactsFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerFragment(context, attributeSet) {
     override fun fabClicked() {
+        activity?.hideKeyboard()
         Intent(context, EditContactActivity::class.java).apply {
             context.startActivity(this)
         }