diff --git a/src/lib/navigation/completer/locationcompleter.cpp b/src/lib/navigation/completer/locationcompleter.cpp
index 4978965df..70c380da5 100644
--- a/src/lib/navigation/completer/locationcompleter.cpp
+++ b/src/lib/navigation/completer/locationcompleter.cpp
@@ -327,7 +327,7 @@ void LocationCompleter::loadUrl(const QUrl &url)
     closePopup();
 
     // Show url in locationbar
-    emit showCompletion(url.toEncoded(), false);
+    emit showCompletion(url.toString(), false);
 
     // Load url
     emit loadCompletion();
diff --git a/src/lib/navigation/completer/locationcompleterdelegate.cpp b/src/lib/navigation/completer/locationcompleterdelegate.cpp
index a66c84b64..965820019 100644
--- a/src/lib/navigation/completer/locationcompleterdelegate.cpp
+++ b/src/lib/navigation/completer/locationcompleterdelegate.cpp
@@ -20,6 +20,7 @@
 #include "locationbar.h"
 #include "iconprovider.h"
 #include "qzsettings.h"
+#include "mainapplication.h"
 
 #include <algorithm>
 
@@ -147,7 +148,16 @@ void LocationCompleterDelegate::paint(QPainter* painter, const QStyleOptionViewI
         if (!isSearchSuggestion && !isWebSearch) {
             link = tr("Visit");
         } else if (opt.state.testFlag(QStyle::State_Selected) || opt.state.testFlag(QStyle::State_MouseOver)) {
-            link = tr("Search with %1").arg(LocationBar::searchEngine().name);
+            QString searchEngineName;
+            const int firstSpacePos = title.indexOf(QL1C(' '));
+            if (firstSpacePos != -1) {
+                const QString shortcut = title.left(firstSpacePos);
+                searchEngineName = mApp->searchEnginesManager()->engineForShortcut(shortcut).name;
+            }
+            if (searchEngineName.isEmpty()) {
+                searchEngineName = LocationBar::searchEngine().name;
+            }
+            link = tr("Search with %1").arg(searchEngineName);
         } else {
             link.clear();
         }