diff --git a/qad/widgets/qcodeedit.cpp b/qad/widgets/qcodeedit.cpp
index 6e9ea5e..72592ef 100644
--- a/qad/widgets/qcodeedit.cpp
+++ b/qad/widgets/qcodeedit.cpp
@@ -910,7 +910,8 @@ void QCodeEdit::commitCompletition() {
 	tc.movePosition(QTextCursor::Right, QTextCursor::KeepAnchor);
 	bool ins_br = true, shifted = false;
 	if (!tc.selectedText().isEmpty()) {
-		if (!tc.selectedText()[0].isLetterOrNumber() && !tc.selectedText()[0].isSpace()) {
+//		if (tc.selectedText()[0].isSpace()) {
+		if (!tc.selectedText()[0].isLetterOrNumber() && !tc.selectedText()[0].isSpace() && !(tc.selectedText()[0] == '_')) {
 			stc.movePosition(QTextCursor::Left);
 			shifted = true;
 		} else {
@@ -928,7 +929,7 @@ void QCodeEdit::commitCompletition() {
 		ins.chop(2);
 	tc = stc;
 	tc.select(QTextCursor::WordUnderCursor);
-	if (!tc.selectedText().leftJustified(1)[0].isLetterOrNumber()) {
+	if (!tc.selectedText().leftJustified(1)[0].isLetterOrNumber() && !(tc.selectedText().leftJustified(1)[0] == '_')) {
 		tc = stc;
 		if (shifted)
 			tc.movePosition(QTextCursor::Right);