diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt
index f96d5f98..42a02dcb 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/activities/MainActivity.kt
@@ -136,19 +136,20 @@ class MainActivity : SimpleActivity() {
     }
 
     override fun onPrepareOptionsMenu(menu: Menu): Boolean {
-        val shouldBeVisible = mNotes.size > 1
+        val multipleNotesExist = mNotes.size > 1
         menu.apply {
-            findItem(R.id.rename_note).isVisible = shouldBeVisible
-            findItem(R.id.open_note).isVisible = shouldBeVisible
-            findItem(R.id.delete_note).isVisible = shouldBeVisible
-            findItem(R.id.export_all_notes).isVisible = shouldBeVisible
+            findItem(R.id.rename_note).isVisible = multipleNotesExist
+            findItem(R.id.open_note).isVisible = multipleNotesExist
+            findItem(R.id.delete_note).isVisible = multipleNotesExist
+            findItem(R.id.export_all_notes).isVisible = multipleNotesExist
             findItem(R.id.open_search).isVisible = !currentItemIsCheckList
+            findItem(R.id.import_folder).isVisible = hasPermission(PERMISSION_READ_STORAGE)
 
             saveNoteButton = findItem(R.id.save_note)
             saveNoteButton!!.isVisible = !config.autosaveNotes && showSaveButton && mCurrentNote.type == NoteType.TYPE_TEXT.value
         }
 
-        pager_title_strip.beVisibleIf(shouldBeVisible)
+        pager_title_strip.beVisibleIf(multipleNotesExist)
         return super.onPrepareOptionsMenu(menu)
     }
 
@@ -167,7 +168,7 @@ class MainActivity : SimpleActivity() {
             R.id.rename_note -> displayRenameDialog()
             R.id.share -> shareText()
             R.id.open_file -> tryOpenFile()
-            R.id.import_folder -> tryOpenFolder()
+            R.id.import_folder -> openFolder()
             R.id.export_as_file -> tryExportAsFile()
             R.id.export_all_notes -> tryExportAllNotes()
             R.id.delete_note -> displayDeleteNotePrompt()
@@ -583,14 +584,6 @@ class MainActivity : SimpleActivity() {
         }
     }
 
-    private fun tryOpenFolder() {
-        handlePermission(PERMISSION_READ_STORAGE) {
-            if (it) {
-                openFolder()
-            }
-        }
-    }
-
     private fun openFolder() {
         FilePickerDialog(this, pickFile = false, canAddShowHiddenButton = true) {
             openFolder(it) {