diff --git a/src/qmlcontrols/kcmcontrols/qml/SimpleKCM.qml b/src/qmlcontrols/kcmcontrols/qml/SimpleKCM.qml
--- a/src/qmlcontrols/kcmcontrols/qml/SimpleKCM.qml
+++ b/src/qmlcontrols/kcmcontrols/qml/SimpleKCM.qml
@@ -18,6 +18,8 @@
 
 import QtQuick 2.7
 import QtQuick.Controls 2.2 as QtControls
+import QtQuick.Window 2.12
+
 import org.kde.kirigami 2.2 as Kirigami
 import org.kde.kcm 1.1 as KCM
 
@@ -46,9 +48,19 @@
 Kirigami.ScrollablePage {
     id: root
 
+    readonly property int contentHeight:
+        flickable.contentHeight
+        + topPadding
+        + bottomPadding
+        + (header && header.visible ? header.implicitHeight : 0)
+        + (footer && footer.visible ? footer.implicitHeight : 0)
+
     title: kcm.name
+
+    // Limit calculated height to 85% of screen height so the window never gets
+    // cut off on short screens
+    implicitHeight: Math.min(contentHeight, Math.floor(Screen.height * 0.85))
     implicitWidth: Kirigami.Units.gridUnit * 20
-    implicitHeight: Math.min(flickable.contentHeight, Kirigami.Units.gridUnit * 20)
 
     leftPadding: Kirigami.Settings.isMobile ? 0 : 4
     topPadding: headerParent.contentItem ? 0 : (Kirigami.Settings.isMobile ? 0 : 4)
diff --git a/src/qmlcontrols/kquickcontrols/private/keysequencehelper.cpp b/src/qmlcontrols/kquickcontrols/private/keysequencehelper.cpp
--- a/src/qmlcontrols/kquickcontrols/private/keysequencehelper.cpp
+++ b/src/qmlcontrols/kquickcontrols/private/keysequencehelper.cpp
@@ -34,7 +34,6 @@
 #include <KStandardShortcut>
 #include <KLocalizedString>
 #include <KMessageBox>
-#include <KKeyServer>
 #include <KGlobalAccel/KGlobalShortcutInfo>
 #include <KGlobalAccel/KGlobalAccel>
 
@@ -354,28 +353,28 @@
                 s.append(QLatin1Char(','));
             }
             if (modifierKeys & Qt::MetaModifier) {
-                s += KKeyServer::modToStringUser(Qt::MetaModifier) + QLatin1Char('+');
+                s += QKeySequence(Qt::MetaModifier).toString(QKeySequence::NativeText);
             }
 #if defined(Q_OS_MAC)
             if (modifierKeys & Qt::AltModifier) {
-                s += KKeyServer::modToStringUser(Qt::AltModifier) + QLatin1Char('+');
+                s += QKeySequence(Qt::AltModifier).toString(QKeySequence::NativeText);
             }
             if (modifierKeys & Qt::ControlModifier) {
-                s += KKeyServer::modToStringUser(Qt::ControlModifier) + QLatin1Char('+');
+                s += QKeySequence(Qt::ControlModifier).toString(QKeySequence::NativeText);
             }
 #else
             if (modifierKeys & Qt::ControlModifier) {
-                s += KKeyServer::modToStringUser(Qt::ControlModifier) + QLatin1Char('+');
+                s += QKeySequence(Qt::ControlModifier).toString(QKeySequence::NativeText);
             }
             if (modifierKeys & Qt::AltModifier) {
-                s += KKeyServer::modToStringUser(Qt::AltModifier) + QLatin1Char('+');
+                s += QKeySequence(Qt::AltModifier).toString(QKeySequence::NativeText);
             }
 #endif
             if (modifierKeys & Qt::ShiftModifier) {
-                s += KKeyServer::modToStringUser(Qt::ShiftModifier) + QLatin1Char('+');
+                s += QKeySequence(Qt::ShiftModifier).toString(QKeySequence::NativeText);
             }
             if (modifierKeys & Qt::KeypadModifier) {
-                s += KKeyServer::modToStringUser(Qt::KeypadModifier) + QLatin1Char('+');
+                s += QKeySequence(Qt::KeypadModifier).toString(QKeySequence::NativeText);
             }
         } else if (nKey == 0) {
             s = i18nc("What the user inputs now will be taken as the new shortcut", "Input");