diff --git a/src/gui/Base/HTile/HTile.qml b/src/gui/Base/HTile/HTile.qml
index d8783939..e594846c 100644
--- a/src/gui/Base/HTile/HTile.qml
+++ b/src/gui/Base/HTile/HTile.qml
@@ -50,7 +50,8 @@ HButton {
     Connections {
         enabled: contextMenuLoader.status === Loader.Ready
         target: contextMenuLoader.item
-        onClosed: contextMenuLoader.active = false
+
+        function onClosed() { contextMenuLoader.active = false }
     }
 
     HLoader {
diff --git a/src/gui/Base/MediaPlayer/VideoPlayer.qml b/src/gui/Base/MediaPlayer/VideoPlayer.qml
index 2895f025..8a229d7f 100644
--- a/src/gui/Base/MediaPlayer/VideoPlayer.qml
+++ b/src/gui/Base/MediaPlayer/VideoPlayer.qml
@@ -42,7 +42,8 @@ Video {
 
     Connections {
         target: mainUI.fullScreenPopup
-        onClosed: fullScreen = false
+
+        function onClosed() { fullScreen = false }
     }
 
     TapHandler {
diff --git a/src/gui/MainPane/RoomList.qml b/src/gui/MainPane/RoomList.qml
index 295cc003..ffc3e3f1 100644
--- a/src/gui/MainPane/RoomList.qml
+++ b/src/gui/MainPane/RoomList.qml
@@ -199,8 +199,10 @@ HListView {
 
     Connections {
         target: pageLoader
-        onPreviousShown:
+
+        function onPreviousShown(componentUrl, properties) {
             if (setCorrectCurrentItem() === false) startCorrectItemSearch()
+        }
     }
 
     Timer {
diff --git a/src/gui/Pages/Chat/RoomPane/RoomPane.qml b/src/gui/Pages/Chat/RoomPane/RoomPane.qml
index 5e90a25a..15637c47 100644
--- a/src/gui/Pages/Chat/RoomPane/RoomPane.qml
+++ b/src/gui/Pages/Chat/RoomPane/RoomPane.qml
@@ -71,8 +71,9 @@ MultiviewPane {
     Connections {
         target: swipeView
 
-        onCurrentItemChanged:
+        function onCurrentItemChanged() {
             swipeView.currentItem.keybindFocusItem.forceActiveFocus()
+        }
     }
 
     MemberView {}
diff --git a/src/gui/Pages/Chat/Timeline/EventContent.qml b/src/gui/Pages/Chat/Timeline/EventContent.qml
index fd1ee084..2ceb65cc 100644
--- a/src/gui/Pages/Chat/Timeline/EventContent.qml
+++ b/src/gui/Pages/Chat/Timeline/EventContent.qml
@@ -171,10 +171,15 @@ HRowLayout {
 
             Connections {
                 target: eventList
-                onCheckedChanged: contentLabel.deselect()
-                onDelegateWithSelectedTextChanged:
+
+                function onCheckedChanged() {
+                    contentLabel.deselect()
+                }
+
+                function onDelegateWithSelectedTextChanged() {
                     if (eventList.delegateWithSelectedText !== model.id)
                         contentLabel.deselect()
+                }
             }
 
             HoverHandler { id: contentHover }