diff --git a/plugins/dojo/src/main/resources/template/ajax/autocompleter.ftl b/plugins/dojo/src/main/resources/template/ajax/autocompleter.ftl
index ac74c1629..07517d6da 100644
--- a/plugins/dojo/src/main/resources/template/ajax/autocompleter.ftl
+++ b/plugins/dojo/src/main/resources/template/ajax/autocompleter.ftl
@@ -106,7 +106,11 @@
 </#if>
 <#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
 <#include "/${parameters.templateDir}/simple/common-attributes.ftl" />
->
+<#if parameters.href?exists>
+ />
+<#else>
+ >
+</#if>
 <#if parameters.list?exists>
 	<#if (parameters.headerKey?exists && parameters.headerValue?exists)>
 		<option value="${parameters.headerKey?html}">${parameters.headerValue?html}</option>
diff --git a/plugins/dojo/src/main/resources/template/ajax/form-close.ftl b/plugins/dojo/src/main/resources/template/ajax/form-close.ftl
index c0fa8756f..078a65c56 100644
--- a/plugins/dojo/src/main/resources/template/ajax/form-close.ftl
+++ b/plugins/dojo/src/main/resources/template/ajax/form-close.ftl
@@ -1,4 +1,4 @@
-
+</table>
 <#if (parameters.customOnsubmitEnabled?default(false))>
 <script type="text/javascript">
 <#-- 
@@ -84,6 +84,4 @@ dojo.require("dojo.event.connect");
 --><#t/>
 	<#lt/><!-- javascript that is needed for tooltips -->
 	<#lt/><script type="text/javascript">dojo.require("dojo.widget.Tooltip");dojo.require("dojo.fx.html");</script>
-
-</table>
 </form>
diff --git a/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/Autocompleter-1.txt b/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/Autocompleter-1.txt
index 0a44ccfc6..b3d764c91 100644
--- a/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/Autocompleter-1.txt
+++ b/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/Autocompleter-1.txt
@@ -18,4 +18,4 @@
  visibleDownArrow="false"
  buttonSrc="i"
  templateCssPath="j"
- dataFieldName="k">
+ dataFieldName="k"/>