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 af3a692d..df76a4ae 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/activities/MainActivity.kt
@@ -135,7 +135,8 @@ class MainActivity : SimpleActivity(), ItemsFragment.ItemInteractionListener, Br
     }
 
     private fun goHome() {
-        openPath(config.homeFolder)
+        if (config.homeFolder != currentPath)
+            openPath(config.homeFolder)
     }
 
     private fun showSortingDialog() {
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 79e32b7c..4541db16 100644
--- a/app/src/main/kotlin/com/simplemobiletools/filemanager/fragments/ItemsFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/fragments/ItemsFragment.kt
@@ -81,7 +81,7 @@ class ItemsFragment : android.support.v4.app.Fragment(), ItemsAdapter.ItemOperat
 
             fragmentView.apply {
                 activity?.runOnUiThread {
-                    items_swipe_refresh.isRefreshing = false
+                    items_swipe_refresh?.isRefreshing = false
                     if (newItems.hashCode() == mItems.hashCode()) {
                         return@runOnUiThread
                     }