diff --git a/b2g/chrome/content/forms.js b/b2g/chrome/content/forms.js
index 55a1464f5b83..17943c2d9d36 100644
--- a/b2g/chrome/content/forms.js
+++ b/b2g/chrome/content/forms.js
@@ -53,7 +53,8 @@ let FormAssistant = {
           checkbox: true,
           radio: true,
           reset: true,
-          submit: true
+          submit: true,
+          image: true
         };
     
         if (evt.target instanceof HTMLSelectElement) { 
@@ -156,6 +157,10 @@ let FormAssistant = {
   },
 
   tryShowIme: function(element) {
+    if (!element) {
+      return;
+    }
+
     // FIXME/bug 729623: work around apparent bug in the IME manager
     // in gecko.
     let readonly = element.getAttribute("readonly");