diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt
index f68fe26b..569bdc03 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt
@@ -71,6 +71,9 @@ class MainActivity : SimpleActivity(), ViewPager.OnPageChangeListener {
         }
 
         storeStateVariables()
+        if (config.showNotePicker) {
+            displayOpenNoteDialog()
+        }
         wasInit = true
     }
 
@@ -204,8 +207,9 @@ class MainActivity : SimpleActivity(), ViewPager.OnPageChangeListener {
             addOnPageChangeListener(this@MainActivity)
         }
 
-        if (!config.showKeyboard)
+        if (!config.showKeyboard) {
             hideKeyboard()
+        }
     }
 
     private fun currentNotesView() = if (view_pager == null) {
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/notes/activities/SettingsActivity.kt
index 8cbd8e16..52284b32 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/notes/activities/SettingsActivity.kt
@@ -19,11 +19,13 @@ import java.util.*
 
 class SettingsActivity : SimpleActivity() {
     lateinit var res: Resources
+    var notes = ArrayList<Note>()
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_settings)
         res = resources
+        notes = dbHelper.getNotes()
     }
 
     override fun onResume() {
@@ -35,6 +37,7 @@ class SettingsActivity : SimpleActivity() {
         setupClickableLinks()
         setupMonospacedFont()
         setupShowKeyboard()
+        setupShowNotePicker()
         setupShowWordCount()
         setupFontSize()
         setupGravity()
@@ -91,6 +94,15 @@ class SettingsActivity : SimpleActivity() {
         }
     }
 
+    private fun setupShowNotePicker() {
+        settings_show_note_picker_holder.beVisibleIf(notes.size > 1)
+        settings_show_note_picker.isChecked = config.showNotePicker
+        settings_show_note_picker_holder.setOnClickListener {
+            settings_show_note_picker.toggle()
+            config.showNotePicker = settings_show_note_picker.isChecked
+        }
+    }
+
     private fun setupShowWordCount() {
         settings_show_word_count.isChecked = config.showWordCount
         settings_show_word_count_holder.setOnClickListener {
@@ -146,7 +158,6 @@ class SettingsActivity : SimpleActivity() {
     })
 
     private fun setupWidgetNote() {
-        val notes = dbHelper.getNotes()
         if (notes.size <= 1) {
             settings_widget_note_holder.visibility = View.GONE
             return
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/helpers/Config.kt b/app/src/main/kotlin/com/simplemobiletools/notes/helpers/Config.kt
index 80b2919e..f9960c14 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/helpers/Config.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/notes/helpers/Config.kt
@@ -25,6 +25,10 @@ class Config(context: Context) : BaseConfig(context) {
         get() = prefs.getBoolean(SHOW_KEYBOARD, true)
         set(showKeyboard) = prefs.edit().putBoolean(SHOW_KEYBOARD, showKeyboard).apply()
 
+    var showNotePicker: Boolean
+        get() = prefs.getBoolean(SHOW_NOTE_PICKER, false)
+        set(showNotePicker) = prefs.edit().putBoolean(SHOW_NOTE_PICKER, showNotePicker).apply()
+
     var showWordCount: Boolean
         get() = prefs.getBoolean(SHOW_WORD_COUNT, false)
         set(showWordCount) = prefs.edit().putBoolean(SHOW_WORD_COUNT, showWordCount).apply()
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/notes/helpers/Constants.kt
index a536f855..1c98010a 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/helpers/Constants.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/notes/helpers/Constants.kt
@@ -10,6 +10,7 @@ const val CLICKABLE_LINKS = "clickable_links"
 const val WIDGET_NOTE_ID = "widget_note_id"
 const val MONOSPACED_FONT = "monospaced_font"
 const val SHOW_KEYBOARD = "show_keyboard"
+const val SHOW_NOTE_PICKER = "show_note_picker"
 const val SHOW_WORD_COUNT = "show_word_count"
 const val FONT_SIZE = "font_size"
 const val GRAVITY = "gravity"
diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/helpers/DBHelper.kt b/app/src/main/kotlin/com/simplemobiletools/notes/helpers/DBHelper.kt
index d7a6d655..d838e1d9 100644
--- a/app/src/main/kotlin/com/simplemobiletools/notes/helpers/DBHelper.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/notes/helpers/DBHelper.kt
@@ -84,7 +84,7 @@ class DBHelper private constructor(private val mContext: Context) : SQLiteOpenHe
         }
     }
 
-    fun getNotes(): List<Note> {
+    fun getNotes(): ArrayList<Note> {
         val notes = ArrayList<Note>()
         val cols = arrayOf(COL_ID, COL_TITLE, COL_VALUE, COL_TYPE, COL_PATH)
         var cursor: Cursor? = null
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index ddf8e41d..941075b2 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -159,6 +159,29 @@
 
         </RelativeLayout>
 
+        <RelativeLayout
+            android:id="@+id/settings_show_note_picker_holder"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/medium_margin"
+            android:background="?attr/selectableItemBackground"
+            android:paddingBottom="@dimen/bigger_margin"
+            android:paddingLeft="@dimen/activity_margin"
+            android:paddingRight="@dimen/activity_margin"
+            android:paddingTop="@dimen/bigger_margin">
+
+            <com.simplemobiletools.commons.views.MySwitchCompat
+                android:id="@+id/settings_show_note_picker"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@null"
+                android:clickable="false"
+                android:paddingLeft="@dimen/medium_margin"
+                android:paddingStart="@dimen/medium_margin"
+                android:text="@string/show_note_picker"/>
+
+        </RelativeLayout>
+
         <RelativeLayout
             android:id="@+id/settings_show_word_count_holder"
             android:layout_width="match_parent"