Index: src/view/kateviewhelpers.cpp
===================================================================
--- src/view/kateviewhelpers.cpp
+++ src/view/kateviewhelpers.cpp
@@ -2461,6 +2461,12 @@
                 if (!foldingRange.isValid() && m_foldingRange) {
                     foldingRange = m_foldingRange->toRange();
                 }
+
+                // Ensure not to fold the end marker to avaoid a deceptive look, but only on token based folding
+                Kate::TextLine startTextLine = m_view->doc()->buffer().plainLine(cursorOnLine);
+                const int adjust = startTextLine->markedAsFoldingStartIndentation() ? 0 : 1;
+                foldingRange.setEnd(KTextEditor::Cursor(foldingRange.end().line() - adjust, 0));
+
                 m_view->textFolding().newFoldingRange(foldingRange, Kate::TextFolding::Folded);
             }