diff --git a/app/build.gradle b/app/build.gradle
index 357db2ac..6f612860 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -45,7 +45,7 @@ ext {
 }
 
 dependencies {
-    implementation 'com.simplemobiletools:commons:3.17.19'
+    implementation 'com.simplemobiletools:commons:3.19.0'
 
     implementation files('../libs/RootTools.jar')
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/MainActivity.kt
index 64ca968a..55767ab1 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/MainActivity.kt
@@ -31,8 +31,7 @@ import java.io.File
 import java.util.*
 
 class MainActivity : SimpleActivity() {
-    var isSearchOpen = false
-
+    private var isSearchOpen = false
     private val BACK_PRESS_TIMEOUT = 5000
     private val PICKED_PATH = "picked_path"
     private var wasBackJustPressed = false
@@ -138,6 +137,7 @@ class MainActivity : SimpleActivity() {
         MenuItemCompat.setOnActionExpandListener(searchMenuItem, object : MenuItemCompat.OnActionExpandListener {
             override fun onMenuItemActionExpand(item: MenuItem?): Boolean {
                 isSearchOpen = true
+                fragment.searchOpened()
                 return true
             }
 
@@ -249,7 +249,8 @@ class MainActivity : SimpleActivity() {
     private fun launchAbout() {
         val faqItems = arrayListOf(
                 FAQItem(R.string.faq_3_title_commons, R.string.faq_3_text_commons),
-                FAQItem(R.string.faq_2_title_commons, R.string.faq_2_text_commons))
+                FAQItem(R.string.faq_2_title_commons, R.string.faq_2_text_commons)
+        )
 
         startAboutActivity(R.string.app_name, LICENSE_MULTISELECT or LICENSE_GLIDE or LICENSE_PATTERN or LICENSE_REPRINT,
                 BuildConfig.VERSION_NAME, faqItems)
diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/fragments/ItemsFragment.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/fragments/ItemsFragment.kt
index cb0c29d1..08c71061 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/fragments/ItemsFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/fragments/ItemsFragment.kt
@@ -37,13 +37,14 @@ class ItemsFragment : Fragment(), ItemOperationsListener, Breadcrumbs.Breadcrumb
     var isGetContentIntent = false
     var isGetRingtonePicker = false
     var isPickMultipleIntent = false
-    var isFirstResume = true
-    var storedItems = ArrayList<FileDirItem>()
 
+    private var isFirstResume = true
     private var showHidden = false
     private var skipItemUpdating = false
+    private var isSearchOpen = false
     private var scrollStates = HashMap<String, Parcelable>()
 
+    private var storedItems = ArrayList<FileDirItem>()
     private var storedTextColor = 0
 
     private lateinit var mView: View
@@ -241,7 +242,12 @@ class ItemsFragment : Fragment(), ItemOperationsListener, Breadcrumbs.Breadcrumb
         }.start()
     }
 
+    fun searchOpened() {
+        isSearchOpen = true
+    }
+
     fun searchClosed() {
+        isSearchOpen = false
         if (!skipItemUpdating) {
             (items_list.adapter as? ItemsAdapter)?.updateItems(storedItems)
         }
diff --git a/build.gradle b/build.gradle
index e6abf43e..af56fd91 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.0'
+        classpath 'com.android.tools.build:gradle:3.1.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong