diff --git a/src/browser/BrowserService.cpp b/src/browser/BrowserService.cpp
index 2e8878a3..e2ee6cac 100644
--- a/src/browser/BrowserService.cpp
+++ b/src/browser/BrowserService.cpp
@@ -395,7 +395,8 @@ QList<Entry*> BrowserService::searchEntries(Database* db, const QString& hostnam
         QUrl qUrl(url);
 
         // Ignore entry if port or scheme defined in the URL doesn't match    
-        if ((entryQUrl.port() > 0 && entryQUrl.port() != qUrl.port()) || entryScheme.compare(qUrl.scheme()) != 0) {
+        if ((entryQUrl.port() > 0 && entryQUrl.port() != qUrl.port()) ||
+            (BrowserSettings::matchUrlScheme() && entryScheme.compare(qUrl.scheme()) != 0)) {
             continue;
         }