diff --git a/app/src/main/kotlin/org/fossify/gallery/dialogs/PickDirectoryDialog.kt b/app/src/main/kotlin/org/fossify/gallery/dialogs/PickDirectoryDialog.kt
index de61dc0c4..98825c872 100644
--- a/app/src/main/kotlin/org/fossify/gallery/dialogs/PickDirectoryDialog.kt
+++ b/app/src/main/kotlin/org/fossify/gallery/dialogs/PickDirectoryDialog.kt
@@ -1,7 +1,8 @@
 package org.fossify.gallery.dialogs
 
 import android.graphics.Color
-import android.view.KeyEvent
+import android.view.KeyEvent.ACTION_UP
+import android.view.KeyEvent.KEYCODE_BACK
 import android.view.inputmethod.EditorInfo
 import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
@@ -54,10 +55,12 @@ class PickDirectoryDialog(
             .setPositiveButton(org.fossify.commons.R.string.ok, null)
             .setNegativeButton(org.fossify.commons.R.string.cancel, null)
             .setOnKeyListener { dialogInterface, i, keyEvent ->
-                if (keyEvent.action == KeyEvent.ACTION_UP && i == KeyEvent.KEYCODE_BACK) {
+                return@setOnKeyListener if (keyEvent.action == ACTION_UP && i == KEYCODE_BACK) {
                     backPressed()
+                    true
+                } else {
+                    false
                 }
-                true
             }
 
         if (showOtherFolderButton) {