diff --git a/src/lib/navigation/locationbar.cpp b/src/lib/navigation/locationbar.cpp
index b8a9b5751..784003846 100644
--- a/src/lib/navigation/locationbar.cpp
+++ b/src/lib/navigation/locationbar.cpp
@@ -105,7 +105,7 @@ QUrl LocationBar::createUrl()
     int firstSpacePos = text().indexOf(" ");
     if (firstSpacePos != -1) {
         QString shortcut = text().mid(0, firstSpacePos);
-        QString searchedString = text().mid(firstSpacePos).trimmed();
+        QString searchedString = QUrl::toPercentEncoding(text().mid(firstSpacePos).trimmed());
 
         SearchEngine en = mApp->searchEnginesManager()->engineForShortcut(shortcut);
         if (!en.name.isEmpty()) {
diff --git a/src/lib/tools/enhancedmenu.cpp b/src/lib/tools/enhancedmenu.cpp
index 56961b825..4818077cd 100644
--- a/src/lib/tools/enhancedmenu.cpp
+++ b/src/lib/tools/enhancedmenu.cpp
@@ -52,7 +52,7 @@ void Menu::mouseReleaseEvent(QMouseEvent* e)
         return;
     }
 
-    if (e->button() == Qt::LeftButton && e->modifiers() == Qt::NoModifier) {
+    if ((e->button() == Qt::LeftButton || e->button() == Qt::RightButton) && e->modifiers() == Qt::NoModifier) {
         closeAllMenus();
         act->trigger();
         e->accept();