diff --git a/src/messages/layouts/messagelayout.cpp b/src/messages/layouts/messagelayout.cpp
index a55d94a2..b28e16f3 100644
--- a/src/messages/layouts/messagelayout.cpp
+++ b/src/messages/layouts/messagelayout.cpp
@@ -196,7 +196,7 @@ void MessageLayout::paint(QPainter &painter, int y, int messageIndex, Selection
 
     // draw message seperation line
     if (app->settings->seperateMessages.getValue()) {
-        painter.fillRect(0, y + this->m_container.getHeight() - 1, this->m_container.getWidth(), 1,
+        painter.fillRect(0, y, this->m_container.getWidth(), 1,
                          app->themes->splits.messageSeperator);
     }
 
diff --git a/src/widgets/splitcontainer.cpp b/src/widgets/splitcontainer.cpp
index 386eecc4..580ebae0 100644
--- a/src/widgets/splitcontainer.cpp
+++ b/src/widgets/splitcontainer.cpp
@@ -155,6 +155,7 @@ void SplitContainer::addSplit(Split *split)
     split->setParent(this);
     split->show();
     split->giveFocus(Qt::MouseFocusReason);
+    this->unsetCursor();
     this->splits.push_back(split);
 
     this->refreshTabTitle();
@@ -201,6 +202,7 @@ SplitContainer::Position SplitContainer::releaseSplit(Split *split)
     this->layout();
     if (splits.size() == 0) {
         this->setSelected(nullptr);
+        this->setCursor(Qt::PointingHandCursor);
     } else {
         this->splits.front()->giveFocus(Qt::MouseFocusReason);
     }
@@ -209,7 +211,6 @@ SplitContainer::Position SplitContainer::releaseSplit(Split *split)
 
     // fourtf: really bad
     split->getChannelView().tabHighlightRequested.disconnectAll();
-    split->focused.disconnectAll();
 
     split->getChannelView().tabHighlightRequested.disconnectAll();