diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 685f61904..0d56f16ce 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -138,6 +138,24 @@
                 <action android:name="android.intent.action.SEARCH" />
             </intent-filter>
 
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="market" android:host="search" />
+            </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="fdroid.search" />
+            </intent-filter>
+
             <meta-data
                 android:name="android.app.searchable"
                 android:resource="@xml/searchable" />
diff --git a/src/org/fdroid/fdroid/SearchResults.java b/src/org/fdroid/fdroid/SearchResults.java
index f259abb52..71e662c93 100644
--- a/src/org/fdroid/fdroid/SearchResults.java
+++ b/src/org/fdroid/fdroid/SearchResults.java
@@ -26,6 +26,7 @@ import android.support.v4.view.MenuItemCompat;
 import android.app.ListActivity;
 import android.app.SearchManager;
 import android.content.Intent;
+import android.net.Uri;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.Menu;
@@ -47,6 +48,21 @@ public class SearchResults extends ListActivity {
 
     private String mQuery;
 
+    protected void getQuery(Intent intent) {
+        if (Intent.ACTION_SEARCH.equals(intent.getAction())) {
+            mQuery = intent.getStringExtra(SearchManager.QUERY);
+        } else {
+            Uri data = intent.getData();
+            if (data.isHierarchical()) {
+                mQuery = data.getQueryParameter("q");
+            } else {
+                mQuery = data.getEncodedSchemeSpecificPart();
+            }
+        }
+        if (mQuery == null || mQuery.length() == 0)
+            finish();
+    }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
 
@@ -58,19 +74,14 @@ public class SearchResults extends ListActivity {
         // Start a search by just typing
         setDefaultKeyMode(DEFAULT_KEYS_SEARCH_LOCAL);
 
-        Intent intent = getIntent();
-
-        if (Intent.ACTION_SEARCH.equals(intent.getAction())) {
-            mQuery = intent.getStringExtra(SearchManager.QUERY);
-        }
+        getQuery(getIntent());
 
         updateView();
     }
 
     @Override
     protected void onNewIntent(Intent intent) {
-        if (Intent.ACTION_SEARCH.equals(intent.getAction()))
-            mQuery = intent.getStringExtra(SearchManager.QUERY);
+        getQuery(intent);
         super.onNewIntent(intent);
         updateView();
     }