diff --git a/src/frontends/qt4/GuiCompleter.cpp b/src/frontends/qt4/GuiCompleter.cpp
index 2eb5f18e35..a110bb21e0 100644
--- a/src/frontends/qt4/GuiCompleter.cpp
+++ b/src/frontends/qt4/GuiCompleter.cpp
@@ -625,9 +625,9 @@ void GuiCompleter::hideInline()
 void GuiCompleter::activate()
 {
 	if (!popupVisible() && !inlineVisible())
-		return;
-
-	popupActivated(currentCompletion());
+		tab();
+	else
+		popupActivated(currentCompletion());
 }
 
 
diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index 108bd0451e..d45b939466 100644
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -1300,7 +1300,14 @@ bool GuiView::getStatus(FuncRequest const & cmd, FuncStatus & flag)
 		break;
 
 	case LFUN_COMPLETION_ACCEPT:
-	case LFUN_COMPLETION_CANCEL:
+		if (!d.current_work_area_
+		    || (!d.current_work_area_->completer().popupVisible()
+			&& !d.current_work_area_->completer().inlineVisible()
+			&& !d.current_work_area_->completer().completionAvailable()))
+			enable = false;
+		break;
+
+		case LFUN_COMPLETION_CANCEL:
 		if (!d.current_work_area_
 		    || (!d.current_work_area_->completer().popupVisible()
 			&& !d.current_work_area_->completer().inlineVisible()))