diff --git a/F-Droid/AndroidManifest.xml b/F-Droid/AndroidManifest.xml
index 0328b2839..a0bec1274 100644
--- a/F-Droid/AndroidManifest.xml
+++ b/F-Droid/AndroidManifest.xml
@@ -366,6 +366,18 @@
                 <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="http" />
+                <data android:scheme="https" />
+                <data android:host="play.google.com" /> <!-- they don't do www. -->
+                <data android:path="/store/search" />
+            </intent-filter>
+
             <meta-data
                 android:name="android.app.searchable"
                 android:resource="@xml/searchable" />
diff --git a/F-Droid/src/org/fdroid/fdroid/views/fragments/SearchResultsFragment.java b/F-Droid/src/org/fdroid/fdroid/views/fragments/SearchResultsFragment.java
index 96816b735..675595b82 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/fragments/SearchResultsFragment.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/fragments/SearchResultsFragment.java
@@ -36,16 +36,25 @@ public class SearchResultsFragment extends ListFragment implements LoaderManager
         if (Intent.ACTION_SEARCH.equals(intent.getAction())) {
             query = intent.getStringExtra(SearchManager.QUERY);
         } else {
-            Uri data = intent.getData();
-            if (data != null && data.isHierarchical()) {
+            final Uri data = intent.getData();
+            if (data == null) {
+                return "";
+            }
+            if (data.isHierarchical()) {
+                // market://search?q=foo
+                // https://play.google.com/store/search?q=foo
                 query = data.getQueryParameter("q");
                 if (query != null && query.startsWith("pname:"))
                     query = query.substring(6);
-            } else if (data!= null) {
+            } else {
+                // fdroid.search:foo
                 query = data.getEncodedSchemeSpecificPart();
             }
         }
-        return query == null ? "" : query;
+        if (query == null) {
+            return "";
+        }
+        return query;
     }
 
     @Override