diff --git a/src/sqltextedit.cpp b/src/sqltextedit.cpp
index f5b73565..30380b0c 100644
--- a/src/sqltextedit.cpp
+++ b/src/sqltextedit.cpp
@@ -104,12 +104,15 @@ void SqlTextEdit::toggleBlockComment()
     // or uncommented, and replace the line text.
     for (int line=lineFrom; line<lineTo; line++) {
         QString lineText = text(line);
+
         if (uncomment)
             lineText.replace(QRegExp("^([ \t]*)-- ?"), "\\1");
         else
             lineText.replace(QRegExp("^"), "-- ");
 
-        setSelection(line, 0, line, lineLength(line));
+        indexTo = lineText.endsWith("\r\n") ? lineLength(line)-1 : lineLength(line);
+
+        setSelection(line, 0, line, indexTo);
         replaceSelectedText(lineText);
     }
 }