diff --git a/libs/widgets/qcodeedit.cpp b/libs/widgets/qcodeedit.cpp
index 2b98ac9..53bbf99 100644
--- a/libs/widgets/qcodeedit.cpp
+++ b/libs/widgets/qcodeedit.cpp
@@ -803,9 +803,28 @@ QRect QCodeEdit::blockSelectionRect() {
 	QTextCursor tc = ui->textCode->textCursor();
 	QPoint ps(block_start_cursor.positionInBlock(), block_start_cursor.blockNumber()),
 		   pe(tc.positionInBlock(), tc.blockNumber());
-	QRect bsr(QPoint(qMin(ps.x(), pe.x()), qMin(ps.y(), pe.y())),
-			  QSize(qAbs(ps.x() - pe.x()), qAbs(ps.y() - pe.y()) + 1));
-	return bsr;
+	//QRect bsr(QPoint(qMin(ps.x(), pe.x()), qMin(ps.y(), pe.y())),
+	//		  QSize(qAbs(ps.x() - pe.x()), qAbs(ps.y() - pe.y()) + 1));
+	//return bsr;
+	return (ui->textCode->cursorRect(tc) | ui->textCode->cursorRect(block_start_cursor))
+			.translated(ui->textCode->horizontalScrollBar()->value(), 0);
+}
+
+
+QVector<QTextCursor> QCodeEdit::blockSelectionCursors(QRect bsr) {
+	QVector<QTextCursor> ret;
+	//qDebug() << bsr;
+	int sline = ui->textCode->cursorForPosition(bsr.topLeft()).blockNumber();
+	int eline = ui->textCode->cursorForPosition(bsr.bottomRight()).blockNumber();
+	for (int l = sline; l <= eline; ++l) {
+		QTextCursor stc(ui->textCode->document()->findBlockByNumber(l)), etc;
+		QRect stc_rect = ui->textCode->cursorRect(stc);
+		stc = ui->textCode->cursorForPosition(stc_rect.center() + QPoint(bsr.left() , 0));
+		etc = ui->textCode->cursorForPosition(stc_rect.center() + QPoint(bsr.right(), 0));
+		stc.setPosition(etc.position(), QTextCursor::KeepAnchor);
+		ret << stc;
+	}
+	return ret;
 }
 
 
@@ -882,27 +901,38 @@ void QCodeEdit::switchBlockSelection(QKeyEvent * ke) {
 
 bool QCodeEdit::removeBlockSelection(bool is_del) {
 	if (!hasBlockSelection()) return false;
+	QRect bsr = blockSelectionRect();
+	bool del = false, back = false;
+	if (bsr.width() <= 1) {
+		if (is_del) del = true;
+		else back = true;
+	}
+	QVector<QTextCursor> clist = blockSelectionCursors(bsr);
 	QTextCursor tc = ui->textCode->textCursor();
 	tc.beginEditBlock();
-	QRect bsr = blockSelectionRect();
-	if (bsr.width() == 0) {
-		if (is_del) bsr.setWidth(1);
-		else if (bsr.x() > 0) bsr.setLeft(bsr.x() - 1);
-	}
-	//qDebug() << bsr;
-	for (int l = bsr.top(); l <= bsr.bottom(); ++l) {
-		QTextCursor ctc(ui->textCode->document()->findBlockByNumber(l));
-		ctc.setPosition(ctc.block().position() + bsr.left(), QTextCursor::MoveAnchor);
-		if (l != ctc.blockNumber()) continue;
-		int pos = ctc.position();
-		ctc.setPosition(ctc.block().position() + bsr.right() + 1, QTextCursor::KeepAnchor);
-		if (l != ctc.blockNumber()) {
-			ctc.setPosition(pos);
-			ctc.movePosition(QTextCursor::EndOfLine, QTextCursor::KeepAnchor);
+	int bspx = ui->textCode->cursorRect(block_start_cursor).center().x();
+	int nullw = ui->textCode->fontMetrics().
+#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
+											horizontalAdvance
+#else
+											width
+#endif
+												(" ");
+	int min_dist = nullw * 0.5;
+	int new_pos = -1;
+	foreach (QTextCursor c, clist) {
+		if (del || back) {
+			if (qAbs(bspx - ui->textCode->cursorRect(c).center().x()) > min_dist) continue;
+			int line = c.blockNumber();
+			c.movePosition(del ? QTextCursor::Right : QTextCursor::Left, QTextCursor::KeepAnchor);
+			if (line != c.blockNumber()) continue;
+			//qDebug() << qAbs(bspx - ui->textCode->cursorRect(c).center().x()) << min_dist;
 		}
-		ctc.removeSelectedText();
+		c.removeSelectedText();
+		if (c.blockNumber() == tc.blockNumber())
+			new_pos = c.position();
 	}
-	tc.setPosition(tc.block().position() + block_start_cursor.positionInBlock());
+	tc.setPosition(new_pos);
 	ui->textCode->setTextCursor(tc);
 	tc.endEditBlock();
 	return true;
@@ -912,18 +942,31 @@ bool QCodeEdit::removeBlockSelection(bool is_del) {
 void QCodeEdit::insertBlockSelection(QString text) {
 	if (!hasBlockSelection()) return;
 	QTextCursor tc = ui->textCode->textCursor();
-	tc.beginEditBlock();
 	QRect bsr = blockSelectionRect();
-	if (bsr.width() > 0) removeBlockSelection(false);
-	for (int l = bsr.top(); l <= bsr.bottom(); ++l) {
-		QTextCursor ctc(ui->textCode->document()->findBlockByNumber(l));
-		ctc.setPosition(ctc.block().position() + bsr.left(), QTextCursor::MoveAnchor);
-		if (l != ctc.blockNumber()) {
-			ctc = QTextCursor(ui->textCode->document()->findBlockByNumber(l));
-			ctc.movePosition(QTextCursor::EndOfLine);
-			ctc.insertText(QString(bsr.left() - ctc.columnNumber(), QChar(' ')));
+	//qDebug() << "___" << bsr;
+	int scrl = ui->textCode->horizontalScrollBar()->value();
+	if (bsr.width() > 1) {
+		removeBlockSelection(false);
+		bsr = blockSelectionRect();
+		//qDebug() << "del" << bsr;
+	}
+	tc.beginEditBlock();
+	//tc.joinPreviousEditBlock();
+	int nullw = ui->textCode->fontMetrics().
+#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
+											horizontalAdvance
+#else
+											width
+#endif
+												(" ");
+	QVector<QTextCursor> clist = blockSelectionCursors(bsr);
+	foreach (QTextCursor c, clist) {
+		c.removeSelectedText();
+		int spcnt = (bsr.left() - ui->textCode->cursorRect(c).center().x() - scrl) / nullw;
+		if (spcnt > 0) {
+			c.insertText(QString(spcnt, QChar(' ')));
 		}
-		ctc.insertText(text);
+		c.insertText(text);
 	}
 	//tc.setPosition(tc.block().position() + block_start_cursor.positionInBlock());
 	//ui->textCode->setTextCursor(tc);
@@ -937,18 +980,9 @@ void QCodeEdit::createBlockSelection() {
 	QTextEdit::ExtraSelection es;
 	es.format.setForeground(palette().brush(QPalette::HighlightedText));
 	es.format.setBackground(palette().brush(QPalette::Highlight));
-	QRect bsr = blockSelectionRect();
-	for (int l = bsr.top(); l <= bsr.bottom(); ++l) {
-		QTextCursor ctc(ui->textCode->document()->findBlockByNumber(l));
-		ctc.setPosition(ctc.block().position() + bsr.left(), QTextCursor::MoveAnchor);
-		if (l != ctc.blockNumber()) continue;
-		int pos = ctc.position();
-		ctc.setPosition(ctc.block().position() + bsr.right() + 1, QTextCursor::KeepAnchor);
-		if (l != ctc.blockNumber()) {
-			ctc.setPosition(pos);
-			ctc.movePosition(QTextCursor::EndOfLine, QTextCursor::KeepAnchor);
-		}
-		es.cursor = ctc;
+	QVector<QTextCursor> clist = blockSelectionCursors(blockSelectionRect());
+	foreach (QTextCursor c, clist) {
+		es.cursor = c;
 		es_blockselection << es;
 	}
 	applyExtraSelection();
diff --git a/libs/widgets/qcodeedit.h b/libs/widgets/qcodeedit.h
index db295c3..89908c8 100644
--- a/libs/widgets/qcodeedit.h
+++ b/libs/widgets/qcodeedit.h
@@ -166,6 +166,7 @@ private:
 	int searchIndFromCursor();
 	QRect cursorRect();
 	QRect blockSelectionRect();
+	QVector<QTextCursor> blockSelectionCursors(QRect bsr);
 	void repaintCursor();
 	void drawCursor();
 	bool hasBlockSelection() const;