diff --git a/src/net/i2p/android/router/web/WebActivity.java b/src/net/i2p/android/router/web/WebActivity.java
index 21a2cbc49a95351cdcf03d7dab7fe628b32bf35b..979bb3bbbb285e73c476a9c0a988452a20cf33bd 100644
--- a/src/net/i2p/android/router/web/WebActivity.java
+++ b/src/net/i2p/android/router/web/WebActivity.java
@@ -11,7 +11,12 @@ public class WebActivity extends I2PActivityBase {
         // Start with the base view
         if (savedInstanceState == null) {
             WebFragment f = new WebFragment();
-            f.setArguments(getIntent().getExtras());
+            if (getIntent().getData() != null) {
+                Bundle b = new Bundle();
+                b.putString(WebFragment.HTML_URI, getIntent().getDataString());
+                f.setArguments(b);
+            } else
+                f.setArguments(getIntent().getExtras());
             getSupportFragmentManager().beginTransaction()
                     .add(R.id.main_fragment, f).commit();
         }