diff --git a/qad/widgets/qcodeedit.cpp b/qad/widgets/qcodeedit.cpp
index 110eef9..551e79b 100644
--- a/qad/widgets/qcodeedit.cpp
+++ b/qad/widgets/qcodeedit.cpp
@@ -167,6 +167,7 @@ void QCodeEdit::setDocument(QTextDocument * doc) {
 		doc->setDocumentLayout(new QPlainTextDocumentLayout(doc));
 	ui->textCode->setDocument(doc);
 	ui->textCode->setCursorWidth(qMax<int>(qRound(fontHeight() / 10.), 1));
+	setShowSpaces(spaces_);
 	if (doc->property("_cursor").isValid()) {
 		setTextCursor(doc->property("_cursor").value<QTextCursor>());
 		textEdit()->verticalScrollBar()->setValue(doc->property("_vpos").toInt());
@@ -693,7 +694,12 @@ void QCodeEdit::searchAll() {
 
 
 void QCodeEdit::search_triggered() {
-	QString st = ui->textCode->textCursor().selectedText();
+	QTextCursor tc = ui->textCode->textCursor();
+	QString st = tc.selectedText();
+	if (st.isEmpty()) {
+		tc.select(QTextCursor::WordUnderCursor);
+		st = tc.selectedText();
+	}
 	search(st);
 	//QMetaObject::invokeMethod(ui->comboSearch->lineEdit(), "returnPressed");
 	if (ui->comboSearch->findText(st) < 0)