diff --git a/doomsday/libs/appfw/src/widgets/lineeditwidget.cpp b/doomsday/libs/appfw/src/widgets/lineeditwidget.cpp
index 502cdbb2ac..5eaba10527 100644
--- a/doomsday/libs/appfw/src/widgets/lineeditwidget.cpp
+++ b/doomsday/libs/appfw/src/widgets/lineeditwidget.cpp
@@ -392,7 +392,9 @@ void LineEditWidget::focusGained()
         d->hint->setOpacity(0);
     }
 
-#if defined (DE_MOBILE)
+    root().window().eventHandler().setKeyboardMode(WindowEventHandler::TextInput);
+    
+/*#if defined (DE_MOBILE)
     {
         auto &win = root().window();
         emit win.textEntryRequest();
@@ -401,19 +403,21 @@ void LineEditWidget::focusGained()
         connect(&win, &GLWindow::userEnteredText, this, &LineEditWidget::userEnteredText);
         connect(&win, &GLWindow::userFinishedTextEntry, this, &LineEditWidget::userFinishedTextEntry);
     }
-#endif
+#endif*/
 }
 
 void LineEditWidget::focusLost()
 {
-#if defined (DE_MOBILE)
+    root().window().eventHandler().setKeyboardMode(WindowEventHandler::RawKeys);
+
+/*#if defined (DE_MOBILE)
     {
         auto &win = root().window();
         disconnect(&win, &GLWindow::userEnteredText, this, &LineEditWidget::userEnteredText);
         disconnect(&win, &GLWindow::userFinishedTextEntry, this, &LineEditWidget::userFinishedTextEntry);
         emit win.textEntryDismiss();
     }
-#endif
+#endif*/
 
     d->contentChanged(false /* don't notify */);
 
@@ -423,7 +427,7 @@ void LineEditWidget::focusLost()
     }
 }
 
-#if defined (DE_MOBILE)
+/*#if defined (DE_MOBILE)
 void LineEditWidget::userEnteredText(QString text)
 {
     setText(text);
@@ -433,7 +437,7 @@ void LineEditWidget::userFinishedTextEntry()
 {
     root().popFocus();
 }
-#endif
+#endif*/
 
 void LineEditWidget::update()
 {
diff --git a/doomsday/libs/appfw/src/widgets/popupwidget.cpp b/doomsday/libs/appfw/src/widgets/popupwidget.cpp
index 5fe2d1fea9..3b61e28abc 100644
--- a/doomsday/libs/appfw/src/widgets/popupwidget.cpp
+++ b/doomsday/libs/appfw/src/widgets/popupwidget.cpp
@@ -94,7 +94,7 @@ DE_GUI_PIMPL(PopupWidget)
         self().setOpeningDirection(openDir);
     }
 
-    typedef Vector2<Rule const *> Vector2R;
+    using Vector2R = Vector2<Rule const *>;
 
     Vector2R anchorRule() const
     {
diff --git a/doomsday/libs/gui/src/windoweventhandler.cpp b/doomsday/libs/gui/src/windoweventhandler.cpp
index 50b110cd97..a374f1da92 100644
--- a/doomsday/libs/gui/src/windoweventhandler.cpp
+++ b/doomsday/libs/gui/src/windoweventhandler.cpp
@@ -290,12 +290,12 @@ void WindowEventHandler::setKeyboardMode(KeyboardMode kbMode)
         d->keyboardMode = kbMode;
         if (kbMode == TextInput)
         {
-            LOG_INPUT_MSG("Begin text input mode");
+            LOG_INPUT_MSG("Keyboard mode changed to text input");
             SDL_StartTextInput();
         }
         else
         {
-            LOG_INPUT_MSG("End text input mode");
+            LOG_INPUT_MSG("Keyboard mode changed to raw key events");
             SDL_StopTextInput();
         }
     }