diff --git a/library/Zend/Dojo/View/Helper/Editor.php b/library/Zend/Dojo/View/Helper/Editor.php
index d6585c5d805..79c4b31c9d0 100644
--- a/library/Zend/Dojo/View/Helper/Editor.php
+++ b/library/Zend/Dojo/View/Helper/Editor.php
@@ -112,8 +112,7 @@ public function direct($id = null, $value = null, $params = array(), $attribs =
 
         $attribs = $this->_prepareDijit($attribs, $params, 'textarea');
 
-        $html  = '<input' . $this->_htmlAttribs($hiddenAttribs) . $this->getClosingBracket();
-        $html .= '<div' . $this->_htmlAttribs($attribs) . '>'
+        $html = '<div' . $this->_htmlAttribs($attribs) . '>'
                . $value
                . "</div>\n";
 
@@ -123,6 +122,8 @@ public function direct($id = null, $value = null, $params = array(), $attribs =
                . $this->view->broker('formTextarea')->direct($hiddenId, $value, $attribs)
                . '</noscript>';
 
+        $html  .= '<input' . $this->_htmlAttribs($hiddenAttribs) . $this->getClosingBracket();
+        
         return $html;
     }
 
diff --git a/tests/Zend/Dojo/View/Helper/EditorTest.php b/tests/Zend/Dojo/View/Helper/EditorTest.php
index b1a6a1daea6..727aad2a834 100644
--- a/tests/Zend/Dojo/View/Helper/EditorTest.php
+++ b/tests/Zend/Dojo/View/Helper/EditorTest.php
@@ -179,4 +179,13 @@ public function testHelperShouldOnlyUseTextareaInNoscriptTag()
         $html = $this->helper->direct('foo');
         $this->assertRegexp('#<noscript><textarea[^>]*>#', $html, $html);
     }
+    
+    /**
+     * @group ZF-11315
+     */
+    public function testHiddenInputShouldBeRenderedLast()
+    {
+        $html = $this->helper->direct('foo');
+        $this->assertRegexp('#</noscript><input#', $html, $html);
+    }
 }