diff --git a/src/org/fdroid/fdroid/AppDetails.java b/src/org/fdroid/fdroid/AppDetails.java
index 6d9a70c4c..500a4f2d4 100644
--- a/src/org/fdroid/fdroid/AppDetails.java
+++ b/src/org/fdroid/fdroid/AppDetails.java
@@ -198,7 +198,7 @@ public class AppDetails extends ListActivity {
 
         Intent i = getIntent();
         appid = "";
-        Uri data = getIntent().getData();
+        Uri data = i.getData();
         if (data != null) {
             if (data.isHierarchical()) {
                 if (data.getHost().equals("details")) {
diff --git a/src/org/fdroid/fdroid/FDroid.java b/src/org/fdroid/fdroid/FDroid.java
index 35eb5478c..858ef5191 100644
--- a/src/org/fdroid/fdroid/FDroid.java
+++ b/src/org/fdroid/fdroid/FDroid.java
@@ -83,7 +83,7 @@ public class FDroid extends FragmentActivity {
         setDefaultKeyMode(DEFAULT_KEYS_SEARCH_LOCAL);
 
         Intent i = getIntent();
-        Uri data = getIntent().getData();
+        Uri data = i.getData();
         if (data != null) {
             String appid = data.getQueryParameter("fdid");
             // If appid == null, we just browse all the apps.