diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index 11b6bd7..8483efa 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -434,6 +434,8 @@
                     {
                         String url = (String) msg.getData().get("url");
                         String title = (String) msg.getData().get("title");
+                        String src = (String) msg.getData().get("src");
+                        if (url == "") url = src; // use image if no anchor
                         if (TextUtils.isEmpty(url)) {
                             break;
                         }
@@ -445,9 +447,11 @@
                         }
                         switch (msg.arg1) {
                             case R.id.open_context_menu_id:
-                            case R.id.view_image_context_menu_id:
                                 loadUrlFromContext(getCurrentTopWebView(), url);
                                 break;
+                            case R.id.view_image_context_menu_id:
+                                loadUrlFromContext(getCurrentTopWebView(), src);
+                                break;
                             case R.id.open_newtab_context_menu_id:
                                 final Tab parent = mTabControl.getCurrentTab();
                                 final Tab newTab = openTab(parent, url, false);
