diff --git a/src/mergeresultwindow.cpp b/src/mergeresultwindow.cpp
--- a/src/mergeresultwindow.cpp
+++ b/src/mergeresultwindow.cpp
@@ -1975,7 +1975,6 @@
         painter.drawPixmap(0, 0, m_pixmap); // Draw everything. (Internally cursor rect is clipped anyway.)
         m_bCursorUpdate = false;
     }
-    painter.end();
 
     if(m_bCursorOn && hasFocus() && m_cursorYPos >= m_firstLine)
     {
@@ -1987,6 +1986,8 @@
         textLayout.drawCursor(&painter, QPointF(0, (m_cursorYPos - m_firstLine) * fontMetrics().lineSpacing()), m_cursorXPos);
     }
 
+    painter.end();
+
     if(!bOldSelectionContainsData && m_selection.selectionContainsData())
         emit newSelection();
 }