1 files changed, 7 insertions, 1 deletions
diff --git a/main/src/ui/conversation_content_view/conversation_view.vala b/main/src/ui/conversation_content_view/conversation_view.vala
index c68ee5de..ac6df1fc 100644
--- a/main/src/ui/conversation_content_view/conversation_view.vala
+++ b/main/src/ui/conversation_content_view/conversation_view.vala
@@ -106,7 +106,7 @@ public class ConversationView : Box, Plugins.ConversationItemCollection, Plugins
         // Get widget under pointer
         int h = 0;
         bool @break = false;
-        Widget w = null;
+        Widget? w = null;
         main.@foreach((widget) => {
             if (break) return;
 
@@ -118,6 +118,12 @@ public class ConversationView : Box, Plugins.ConversationItemCollection, Plugins
             }
         });
 
+        if (w == null) {
+            if (currently_highlighted != null) currently_highlighted.unset_state_flags(StateFlags.PRELIGHT);
+            currently_highlighted = null;
+            return;
+        }
+
         // Get widget coordinates in main
         int widget_x, widget_y;
         w.translate_coordinates(main, 0, 0, out widget_x, out widget_y);