diff --git a/qml/component/MessageDelegate.qml b/qml/component/MessageDelegate.qml
index 9eeaaa4..60f1c30 100644
--- a/qml/component/MessageDelegate.qml
+++ b/qml/component/MessageDelegate.qml
@@ -7,7 +7,7 @@ import Matrique.Settings 0.1
 
 RowLayout {
     readonly property bool avatarVisible: !(sentByMe || (aboveAuthor === author && section === aboveSection))
-    readonly property bool highlighted: !sentByMe
+    readonly property bool highlighted: !(sentByMe || eventType === "notice" )
     readonly property bool sentByMe: author === currentRoom.localUser
     readonly property bool isText: eventType === "notice" || eventType === "message"
 
@@ -47,7 +47,7 @@ RowLayout {
 
         id: genericBubble
 
-        highlighted: !sentByMe
+        highlighted: messageRow.highlighted
         colored: highlighted && (eventType === "notice" || highlight)
 
         contentItem: ColumnLayout {
diff --git a/qml/main.qml b/qml/main.qml
index a0a3d0a..f1111bd 100644
--- a/qml/main.qml
+++ b/qml/main.qml
@@ -36,7 +36,16 @@ ApplicationWindow {
     Controller {
         id: matriqueController
 
-        onToggleWindow: window.visible ? window.hide() : window.show()
+        onToggleWindow: {
+            console.log("Activating window...")
+            if (window.visible) {
+                window.hide()
+            } else {
+                window.show()
+                window.raise()
+                window.requestActivate()
+            }
+        }
     }
 
     Popup {