diff --git a/look-and-feel/contents/lockscreen/Keypad.qml b/look-and-feel/contents/lockscreen/Keypad.qml
index 88ac83d2..e2aff22c 100644
--- a/look-and-feel/contents/lockscreen/Keypad.qml
+++ b/look-and-feel/contents/lockscreen/Keypad.qml
@@ -16,7 +16,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 import QtQuick 2.12
-import QtQuick.Controls 1.1
+import QtQuick.Controls 2.1
 import QtQuick.Layouts 1.1
 import QtGraphicalEffects 1.12
 import org.kde.plasma.components 2.0 as PlasmaComponents
@@ -220,7 +220,7 @@ Rectangle {
                         color: "white"
                         visible: modelData.length > 0
 
-                        MouseArea {
+                        AbstractButton {
                             anchors.fill: parent
                             onPressed: parent.color = "#e0e0e0"
                             onReleased: parent.color = "white"
diff --git a/shell/contents/views/Pin.qml b/shell/contents/views/Pin.qml
index 381bf069..43a1e269 100644
--- a/shell/contents/views/Pin.qml
+++ b/shell/contents/views/Pin.qml
@@ -246,7 +246,7 @@ PlasmaCore.ColorScope {
                             color: "white"
                             visible: modelData.length > 0
 
-                            MouseArea {
+                            AbstractButton {
                                 anchors.fill: parent
                                 onPressed: parent.color = "#e0e0e0"
                                 onReleased: parent.color = "white"