diff --git a/src/chatlog/chatlog.cpp b/src/chatlog/chatlog.cpp
index f4b6e4af8..9d0cc9075 100644
--- a/src/chatlog/chatlog.cpp
+++ b/src/chatlog/chatlog.cpp
@@ -262,9 +262,6 @@ void ChatLog::mouseMoveEvent(QMouseEvent* ev)
             ChatLineContent* content = getContentFromPos(scenePos);
             ChatLine::Ptr line = findLineByPosY(scenePos.y());
 
-            if(!content && !line.get())
-                return;
-
             int row;
 
             if(content)
@@ -298,6 +295,8 @@ void ChatLog::mouseMoveEvent(QMouseEvent* ev)
                 }
 
             }
+            else
+                return;
 
             if(row >= selClickedRow)
                 selLastRow = row;
diff --git a/src/chatlog/chatlog.h b/src/chatlog/chatlog.h
index db6cf973a..b972e25aa 100644
--- a/src/chatlog/chatlog.h
+++ b/src/chatlog/chatlog.h
@@ -29,7 +29,7 @@ class QGraphicsRectItem;
 class QMouseEvent;
 class QTimer;
 class ChatLineContent;
-class ToxFile;
+struct ToxFile;
 
 class ChatLog : public QGraphicsView
 {