diff --git a/src/commoncomponents/BackButton.qml b/src/commoncomponents/BackButton.qml
index 71eea2764d1b759ac15310a4a6ef3d8f9a50904e..239893223a88eab62571521f2a06c6cccf907a1f 100644
--- a/src/commoncomponents/BackButton.qml
+++ b/src/commoncomponents/BackButton.qml
@@ -31,7 +31,8 @@ PushButton {
     toolTipText: JamiStrings.back
 
     Keys.onPressed: function (keyEvent) {
-        if (keyEvent.matches(StandardKey.InsertParagraphSeparator)) {
+        if (keyEvent.key === Qt.Key_Enter ||
+                keyEvent.key === Qt.Key_Return) {
             clicked()
             keyEvent.accepted = true
         }
diff --git a/src/commoncomponents/JamiSwitch.qml b/src/commoncomponents/JamiSwitch.qml
index 055919efd965ab34f990aba439f9ef2434a3208e..70e89ec17d3c4f1906b8307745921352f6f2433c 100644
--- a/src/commoncomponents/JamiSwitch.qml
+++ b/src/commoncomponents/JamiSwitch.qml
@@ -54,7 +54,8 @@ Switch {
     }
 
     Keys.onPressed: function (keyEvent) {
-        if (keyEvent.matches(StandardKey.InsertParagraphSeparator)) {
+        if (keyEvent.key === Qt.Key_Enter ||
+                keyEvent.key === Qt.Key_Return) {
             checked = !checked
             keyEvent.accepted = true
         }
diff --git a/src/commoncomponents/MaterialButton.qml b/src/commoncomponents/MaterialButton.qml
index 85a9f0a8229f7cb5d7010a2cd012dc74b9842bfd..6eed704e70fe60e279abb6b81eb2f9232ae3695d 100644
--- a/src/commoncomponents/MaterialButton.qml
+++ b/src/commoncomponents/MaterialButton.qml
@@ -191,7 +191,8 @@ Button {
     }
 
     Keys.onPressed: function (keyEvent) {
-        if (keyEvent.matches(StandardKey.InsertParagraphSeparator)) {
+        if (keyEvent.key === Qt.Key_Enter ||
+                keyEvent.key === Qt.Key_Return) {
             clicked()
             keyEvent.accepted = true
         }
diff --git a/src/commoncomponents/PhotoboothView.qml b/src/commoncomponents/PhotoboothView.qml
index 0ad3c88f52a7cdc9b9f66c11de40c069a745de84..a0496e603ce75e11edc8113bbd0a5306d53d46df 100644
--- a/src/commoncomponents/PhotoboothView.qml
+++ b/src/commoncomponents/PhotoboothView.qml
@@ -198,10 +198,11 @@ Item {
                             JamiResources.baseline_camera_alt_24dp_svg
 
                 Keys.onPressed: function (keyEvent) {
-                    if (keyEvent.matches(StandardKey.InsertParagraphSeparator)) {
+                    if (keyEvent.key === Qt.Key_Enter ||
+                            keyEvent.key === Qt.Key_Return) {
                         clicked()
                         keyEvent.accepted = true
-                    } else if (keyEvent.matches(StandardKey.MoveToPreviousLine)) {
+                    } else if (keyEvent.key === Qt.Key_Up) {
                         root.focusOnPreviousItem()
                         keyEvent.accepted = true
                     }
@@ -245,11 +246,12 @@ Item {
                 KeyNavigation.up: takePhotoButton
 
                 Keys.onPressed: function (keyEvent) {
-                    if (keyEvent.matches(StandardKey.InsertParagraphSeparator)) {
+                    if (keyEvent.key === Qt.Key_Enter ||
+                            keyEvent.key === Qt.Key_Return) {
                         clicked()
                         takePhotoButton.forceActiveFocus()
                         keyEvent.accepted = true
-                    } else if (keyEvent.matches(StandardKey.MoveToNextLine) ||
+                    } else if (keyEvent.key === Qt.Key_Down ||
                                keyEvent.key === Qt.Key_Tab) {
                         if (isPreviewing) {
                             root.focusOnNextItem()
@@ -283,11 +285,12 @@ Item {
                 imageColor: JamiTheme.textColor
 
                 Keys.onPressed: function (keyEvent) {
-                    if (keyEvent.matches(StandardKey.InsertParagraphSeparator)) {
+                    if (keyEvent.key === Qt.Key_Enter ||
+                            keyEvent.key === Qt.Key_Return) {
                         focusAfterFileDialogClosed = true
                         clicked()
                         keyEvent.accepted = true
-                    } else if (keyEvent.matches(StandardKey.MoveToNextLine) ||
+                    } else if (keyEvent.key === Qt.Key_Down ||
                                keyEvent.key === Qt.Key_Tab) {
                         root.focusOnNextItem()
                         keyEvent.accepted = true
diff --git a/src/mainview/components/ContactSearchBar.qml b/src/mainview/components/ContactSearchBar.qml
index c67912cbe662c975de6fc3eea97c0bf026e78b09..1d8dda8dce646bbb572b97c63865060f37dc4969 100644
--- a/src/mainview/components/ContactSearchBar.qml
+++ b/src/mainview/components/ContactSearchBar.qml
@@ -134,7 +134,8 @@ Rectangle {
     }
 
     Keys.onPressed: function (keyEvent) {
-        if (keyEvent.matches(StandardKey.InsertParagraphSeparator)) {
+        if (keyEvent.key === Qt.Key_Enter ||
+                keyEvent.key === Qt.Key_Return) {
             if (contactSearchBar.text !== "") {
                 returnPressedWhileSearching()
                 keyEvent.accepted = true
diff --git a/src/mainview/components/MessageBarTextArea.qml b/src/mainview/components/MessageBarTextArea.qml
index dffeac6035b7eda19c05f5187994d49bdfe05c29..9a2310c0bb4abb2303b983e5ca352822eba3f651 100644
--- a/src/mainview/components/MessageBarTextArea.qml
+++ b/src/mainview/components/MessageBarTextArea.qml
@@ -138,7 +138,8 @@ Flickable {
             if (keyEvent.matches(StandardKey.Paste)) {
                 MessagesAdapter.pasteKeyDetected()
                 keyEvent.accepted = true
-            } else if (keyEvent.matches(StandardKey.InsertParagraphSeparator)) {
+            } else if (keyEvent.key === Qt.Key_Enter ||
+                       keyEvent.key === Qt.Key_Return) {
                 if (!(keyEvent.modifiers & Qt.ShiftModifier)) {
                     root.sendMessagesRequired()
                     keyEvent.accepted = true
diff --git a/src/wizardview/components/ProfilePage.qml b/src/wizardview/components/ProfilePage.qml
index c5d187b2716039642a078a8e5a3ee7e5bf4b5b14..91d48292b19d6e686d1fa0229c286fe796b66b0f 100644
--- a/src/wizardview/components/ProfilePage.qml
+++ b/src/wizardview/components/ProfilePage.qml
@@ -154,7 +154,7 @@ Rectangle {
             KeyNavigation.down: KeyNavigation.tab
 
             Keys.onPressed: function (keyEvent) {
-                if (keyEvent.matches(StandardKey.MoveToPreviousLine)) {
+                if (keyEvent.key === Qt.Key_Up) {
                     setAvatarWidget.focusOnPreviousPhotoBoothItem()
                     keyEvent.accepted = true
                 }
@@ -221,7 +221,7 @@ Rectangle {
             KeyNavigation.up: saveProfileBtn
 
             Keys.onPressed: function (keyEvent) {
-                if (keyEvent.matches(StandardKey.MoveToNextLine) ||
+                if (keyEvent.key === Qt.Key_Down ||
                         keyEvent.key === Qt.Key_Tab) {
                     setAvatarWidget.focusOnNextPhotoBoothItem()
                     keyEvent.accepted = true