diff --git a/src/plugins/texteditor/basetextdocument.cpp b/src/plugins/texteditor/basetextdocument.cpp
index 1e13af7e101e7a5270e6bc79d524109bcb14cc25..0b799c20dfb9c42ec48bdb5c2828ce54fd1058e5 100644
--- a/src/plugins/texteditor/basetextdocument.cpp
+++ b/src/plugins/texteditor/basetextdocument.cpp
@@ -166,8 +166,8 @@ bool BaseTextDocument::save(const QString &fileName)
     // When saving the current editor, make sure to maintain the cursor position for undo
     Core::IEditor *currentEditor = Core::EditorManager::instance()->currentEditor();
     if (BaseTextEditorEditable *editable = qobject_cast<BaseTextEditorEditable*>(currentEditor)) {
-        if (editable->file() == this)
-            cursor = editable->editor()->textCursor();
+        if (editable->file() == this) 
+            cursor.setPosition(editable->editor()->textCursor().position());
     }
 
     cursor.beginEditBlock();
@@ -382,6 +382,7 @@ void BaseTextDocument::cleanWhitespace(const QTextCursor &cursor)
 {
     bool hasSelection = cursor.hasSelection();
     QTextCursor copyCursor = cursor;
+    copyCursor.setVisualNavigation(false);
     copyCursor.beginEditBlock();
     cleanWhitespace(copyCursor, true, true);
     if (!hasSelection)
@@ -392,6 +393,7 @@ void BaseTextDocument::cleanWhitespace(const QTextCursor &cursor)
 void BaseTextDocument::cleanWhitespace(QTextCursor &cursor, bool cleanIndentation, bool inEntireDocument)
 {
     BaseTextDocumentLayout *documentLayout = qobject_cast<BaseTextDocumentLayout*>(m_document->documentLayout());
+    Q_ASSERT(cursor.visualNavigation() == false);
 
     QTextBlock block = m_document->findBlock(cursor.selectionStart());
     QTextBlock end;
diff --git a/src/plugins/texteditor/basetextdocumentlayout.cpp b/src/plugins/texteditor/basetextdocumentlayout.cpp
index c69808f8de8838de3b518ddac59fbb0322607768..06cacd7d811113a8141c39f37f8001388b480c90 100644
--- a/src/plugins/texteditor/basetextdocumentlayout.cpp
+++ b/src/plugins/texteditor/basetextdocumentlayout.cpp
@@ -527,7 +527,7 @@ void BaseTextDocumentLayout::doFoldOrUnfold(const QTextBlock& block, bool unfold
     QTextBlock b = block.next();
 
     int indent = foldingIndent(block);
-    while (b.isValid() && foldingIndent(b) > indent && b.next().isValid()) {
+    while (b.isValid() && foldingIndent(b) > indent && (unfold || b.next().isValid())) {
         b.setVisible(unfold);
         b.setLineCount(unfold? qMax(1, b.layout()->lineCount()) : 0);
         if (unfold) { // do not unfold folded sub-blocks
diff --git a/src/plugins/texteditor/basetexteditor.cpp b/src/plugins/texteditor/basetexteditor.cpp
index 5388c5cce7fecfef05d89ea48312765b541ffbb1..621a677257445943730d3fb46c5d4ea18dd22e88 100644
--- a/src/plugins/texteditor/basetexteditor.cpp
+++ b/src/plugins/texteditor/basetexteditor.cpp
@@ -3431,7 +3431,7 @@ void BaseTextEditor::updateCurrentLineHighlight()
         if (block.isValid())
             d->m_extraArea->update(blockBoundingGeometry(block).translated(offset).toAlignedRect());
         block = document()->findBlockByNumber(cursorBlockNumber);
-        if (block.isValid())
+        if (block.isValid() && block.isVisible())
             d->m_extraArea->update(blockBoundingGeometry(block).translated(offset).toAlignedRect());
         d->m_cursorBlockNumber = cursorBlockNumber;
     }