diff --git a/data/themes/elarun/Main.qml b/data/themes/elarun/Main.qml
index 174a3b8..b5831c2 100644
--- a/data/themes/elarun/Main.qml
+++ b/data/themes/elarun/Main.qml
@@ -33,6 +33,8 @@ Rectangle {
     LayoutMirroring.enabled: Qt.locale().textDirection == Qt.RightToLeft
     LayoutMirroring.childrenInherit: true
 
+    property int sessionIndex: session.index
+
     TextConstants { id: textConstants }
 
     Connections {
@@ -132,7 +134,7 @@ Rectangle {
 
                             Keys.onPressed: {
                                 if (event.key === Qt.Key_Return || event.key === Qt.Key_Enter) {
-                                    sddm.login(user_entry.text, pw_entry.text, menu_session.index)
+                                    sddm.login(user_entry.text, pw_entry.text, sessionIndex)
                                     event.accepted = true
                                 }
                             }
@@ -148,7 +150,7 @@ Rectangle {
 
                     source: "images/login_normal.png"
 
-                    onClicked: sddm.login(user_entry.text, pw_entry.text, menu_session.index)
+                    onClicked: sddm.login(user_entry.text, pw_entry.text, sessionIndex)
 
                     KeyNavigation.backtab: pw_entry; KeyNavigation.tab: session_button
                 }
@@ -213,15 +215,6 @@ Rectangle {
                         font.bold: true
                         font.pixelSize: 12
                     }
-
-                    Menu {
-                        id: menu_session
-                        width: 200; height: 0
-                        anchors.top: buttonRow.bottom; anchors.left: buttonRow.left
-
-                        model: sessionModel
-                        index: sessionModel.lastIndex
-                    }
                 }
             }
         }
diff --git a/data/themes/maldives/Main.qml b/data/themes/maldives/Main.qml
index 00feea4..49fbe02 100644
--- a/data/themes/maldives/Main.qml
+++ b/data/themes/maldives/Main.qml
@@ -33,6 +33,8 @@ Rectangle {
     LayoutMirroring.enabled: Qt.locale().textDirection == Qt.RightToLeft
     LayoutMirroring.childrenInherit: true
 
+    property int sessionIndex: session.index
+
     TextConstants { id: textConstants }
 
     Connections {
@@ -121,7 +123,7 @@ Rectangle {
 
                         Keys.onPressed: {
                             if (event.key === Qt.Key_Return || event.key === Qt.Key_Enter) {
-                                sddm.login(name.text, password.text, session.index)
+                                sddm.login(name.text, password.text, sessionIndex)
                                 event.accepted = true
                             }
                         }
@@ -148,7 +150,7 @@ Rectangle {
 
                         Keys.onPressed: {
                             if (event.key === Qt.Key_Return || event.key === Qt.Key_Enter) {
-                                sddm.login(name.text, password.text, session.index)
+                                sddm.login(name.text, password.text, sessionIndex)
                                 event.accepted = true
                             }
                         }
@@ -237,7 +239,7 @@ Rectangle {
                         text: textConstants.login
                         width: parent.btnWidth
 
-                        onClicked: sddm.login(name.text, password.text, session.index)
+                        onClicked: sddm.login(name.text, password.text, sessionIndex)
 
                         KeyNavigation.backtab: layoutBox; KeyNavigation.tab: shutdownButton
                     }