diff --git a/src/widgets/DisassemblyWidget.cpp b/src/widgets/DisassemblyWidget.cpp
index dd4e7398..05802bb0 100644
--- a/src/widgets/DisassemblyWidget.cpp
+++ b/src/widgets/DisassemblyWidget.cpp
@@ -152,7 +152,7 @@ void DisassemblyWidget::refreshDisasm(RVA offset)
     // because pd N may return more than N lines, move maxLines lines down from the top
     mDisasTextEdit->moveCursor(QTextCursor::Start);
     QTextCursor tc = mDisasTextEdit->textCursor();
-    tc.movePosition(QTextCursor::Down, QTextCursor::MoveAnchor, maxLines-1);
+    tc.movePosition(QTextCursor::Down, QTextCursor::MoveAnchor, maxLines - 1);
     mDisasTextEdit->setTextCursor(tc);
 
     connectCursorPositionChanged(false);
@@ -163,6 +163,11 @@ void DisassemblyWidget::refreshDisasm(RVA offset)
         bottomOffset = topOffset;
     }
 
+    // remove additional lines
+    tc.movePosition(QTextCursor::EndOfLine);
+    tc.movePosition(QTextCursor::End, QTextCursor::KeepAnchor);
+    tc.removeSelectedText();
+
     updateCursorPosition();
 
     mDisasTextEdit->setLockScroll(false);
@@ -191,14 +196,18 @@ void DisassemblyWidget::scrollInstructions(int count)
 }
 
 
-void DisassemblyWidget::updateMaxLines()
+bool DisassemblyWidget::updateMaxLines()
 {
     int currentMaxLines = qhelpers::getMaxFullyDisplayedLines(mDisasTextEdit);
+
     if (currentMaxLines != maxLines)
     {
         maxLines = currentMaxLines;
         refreshDisasm();
+        return true;
     }
+
+    return false;
 }
 
 void DisassemblyWidget::highlightCurrentLine()
@@ -434,7 +443,11 @@ void DisassemblyWidget::raisePrioritizedMemoryWidget(CutterCore::MemoryWidgetTyp
 void DisassemblyWidget::fontsUpdatedSlot()
 {
     mDisasTextEdit->setFont(Config()->getFont());
-    refreshDisasm();
+
+    if (!updateMaxLines()) // updateMaxLines() returns true if it already refreshed.
+    {
+        refreshDisasm();
+    }
 }
 
 DisassemblyScrollArea::DisassemblyScrollArea(QWidget *parent) : QAbstractScrollArea(parent)
diff --git a/src/widgets/DisassemblyWidget.h b/src/widgets/DisassemblyWidget.h
index fa0c5149..15d79690 100644
--- a/src/widgets/DisassemblyWidget.h
+++ b/src/widgets/DisassemblyWidget.h
@@ -31,7 +31,7 @@ private slots:
     void raisePrioritizedMemoryWidget(CutterCore::MemoryWidgetType type);
 
     void scrollInstructions(int count);
-    void updateMaxLines();
+    bool updateMaxLines();
 
     void cursorPositionChanged();