diff --git a/components/layout/wrapper.rs b/components/layout/wrapper.rs
index 678ebd63582..17102f0095d 100644
--- a/components/layout/wrapper.rs
+++ b/components/layout/wrapper.rs
@@ -954,18 +954,20 @@ impl<'ln> ThreadSafeLayoutNode<'ln> {
             let insertion_point = unsafe {
                 input.get_insertion_point_for_layout()
             };
-            let text = unsafe {
-                input.get_value_for_layout()
-            };
+            if let Some(insertion_point) = insertion_point {
+                let text = unsafe {
+                    input.get_value_for_layout()
+                };
 
-            let mut character_count = 0;
-            for (character_index, _) in text.char_indices() {
-                if character_index == insertion_point.index {
-                    return Some(CharIndex(character_count))
+                let mut character_count = 0;
+                for (character_index, _) in text.char_indices() {
+                    if character_index == insertion_point.index {
+                        return Some(CharIndex(character_count))
+                    }
+                    character_count += 1
                 }
-                character_count += 1
+                return Some(CharIndex(character_count))
             }
-            return Some(CharIndex(character_count))
         }
         None
     }
diff --git a/components/script/dom/htmlinputelement.rs b/components/script/dom/htmlinputelement.rs
index 40020a74d14..a07529ebbec 100644
--- a/components/script/dom/htmlinputelement.rs
+++ b/components/script/dom/htmlinputelement.rs
@@ -143,7 +143,7 @@ pub trait LayoutHTMLInputElementHelpers {
     #[allow(unsafe_code)]
     unsafe fn get_size_for_layout(self) -> u32;
     #[allow(unsafe_code)]
-    unsafe fn get_insertion_point_for_layout(self) -> TextPoint;
+    unsafe fn get_insertion_point_for_layout(self) -> Option<TextPoint>;
 }
 
 pub trait RawLayoutHTMLInputElementHelpers {
@@ -197,8 +197,12 @@ impl LayoutHTMLInputElementHelpers for LayoutJS<HTMLInputElement> {
 
     #[allow(unrooted_must_root)]
     #[allow(unsafe_code)]
-    unsafe fn get_insertion_point_for_layout(self) -> TextPoint {
-        (*self.unsafe_get()).textinput.borrow_for_layout().edit_point
+    unsafe fn get_insertion_point_for_layout(self) -> Option<TextPoint> {
+        match (*self.unsafe_get()).input_type.get() {
+          InputType::InputText | InputType::InputPassword =>
+              Some((*self.unsafe_get()).textinput.borrow_for_layout().edit_point),
+          _ => None
+        }
     }
 }
 
diff --git a/tests/ref/basic.list b/tests/ref/basic.list
index 7d3ff35c43a..e3dbf37b144 100644
--- a/tests/ref/basic.list
+++ b/tests/ref/basic.list
@@ -337,6 +337,7 @@ device-pixel-ratio=2 != pixel_snapping_border_a.html pixel_snapping_border_ref.h
 == stacking_context_overflow_a.html stacking_context_overflow_ref.html
 == stacking_context_overflow_relative_outline_a.html stacking_context_overflow_relative_outline_ref.html
 == style_is_in_doc.html style_is_in_doc_ref.html
+== submit_focus_a.html submit_focus_b.html
 == table_auto_width.html table_auto_width_ref.html
 == table_caption_bottom_a.html table_caption_bottom_ref.html
 == table_caption_top_a.html table_caption_top_ref.html
diff --git a/tests/ref/submit_focus_a.html b/tests/ref/submit_focus_a.html
new file mode 100644
index 00000000000..261f3f005ec
--- /dev/null
+++ b/tests/ref/submit_focus_a.html
@@ -0,0 +1,10 @@
+<style>
+button {
+    display: inline-block;
+}
+</style>
+<button id="1">Submit</button>
+<script>
+var elem = document.getElementById('1');
+elem.focus();
+</script>
diff --git a/tests/ref/submit_focus_b.html b/tests/ref/submit_focus_b.html
new file mode 100644
index 00000000000..1cedc3523a7
--- /dev/null
+++ b/tests/ref/submit_focus_b.html
@@ -0,0 +1,11 @@
+<style>
+input {
+    padding-left: 0;
+    padding-right: 0;
+}
+</style>
+<input id="1" type="submit"></input>
+<script>
+var elem = document.getElementById('1');
+elem.focus();
+</script>