diff --git a/qml/FolderGridViewPopup.qml b/qml/FolderGridViewPopup.qml
index e742397a..5343dc3e 100644
--- a/qml/FolderGridViewPopup.qml
+++ b/qml/FolderGridViewPopup.qml
@@ -254,8 +254,10 @@ Popup {
 
                     Item {
                         anchors.fill: parent
-                        TapHandler {
-                            onTapped: {
+                        MouseArea {
+                            anchors.fill: parent
+                            enabled: contentRoot.nameEditing
+                            onClicked: {
                                 folderNameEdit.editingFinished()
                             }
                         }