diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/InputTagHelper.cs b/src/Microsoft.AspNet.Mvc.TagHelpers/InputTagHelper.cs
index 28f59acc1c..3b520c46fb 100644
--- a/src/Microsoft.AspNet.Mvc.TagHelpers/InputTagHelper.cs
+++ b/src/Microsoft.AspNet.Mvc.TagHelpers/InputTagHelper.cs
@@ -249,12 +249,14 @@ namespace Microsoft.AspNet.Mvc.TagHelpers
                 output.Attributes.Clear();
                 output.TagName = null;
 
-                output.Content.Append(tagBuilder.ToHtmlContent(TagRenderMode.SelfClosing));
+                var renderingMode =
+                    output.TagMode == TagMode.SelfClosing ? TagRenderMode.SelfClosing : TagRenderMode.StartTag;
+                output.Content.Append(tagBuilder.ToHtmlContent(renderingMode));
 
                 tagBuilder = Generator.GenerateHiddenForCheckbox(ViewContext, modelExplorer, For.Name);
                 if (tagBuilder != null)
                 {
-                    output.Content.Append(tagBuilder.ToHtmlContent(TagRenderMode.SelfClosing));
+                    output.Content.Append(tagBuilder.ToHtmlContent(renderingMode));
                 }
             }
         }
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Input.html b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Input.html
index ff75fad2c5..87ced71609 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Input.html
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Input.html
@@ -9,9 +9,9 @@
 
     <input name="InterfaceFile" type="file" id="InterfaceFile" />
     <input name="InterfaceFiles" type="file" id="InterfaceFiles" multiple="multiple" />
-    <input name="ConcreteFile" type="file" id="ConcreteFile" />
+    <input name="ConcreteFile" type="file" id="ConcreteFile">
     <input name="ConcreteFiles" type="file" id="ConcreteFiles" multiple="multiple" />
-    <input name="EnumerableFiles" type="file" id="EnumerableFiles" multiple="multiple" />
+    <input name="EnumerableFiles" type="file" id="EnumerableFiles" multiple="multiple">
 
     <input class="text-box single-line" id="InterfaceFile" name="InterfaceFile" type="file" />
     <input class="text-box single-line" id="InterfaceFiles" multiple="multiple" name="InterfaceFiles" type="file" />
diff --git a/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Input.cshtml b/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Input.cshtml
index b3e44285a2..1ba6cd0eef 100644
--- a/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Input.cshtml
+++ b/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Input.cshtml
@@ -13,9 +13,9 @@
 
     <input asp-for="InterfaceFile" name="InterfaceFile" />
     <input asp-for="InterfaceFiles" name="InterfaceFiles" />
-    <input asp-for="ConcreteFile" name="ConcreteFile" />
+    <input asp-for="ConcreteFile" name="ConcreteFile">
     <input asp-for="ConcreteFiles" name="ConcreteFiles" />
-    <input asp-for="EnumerableFiles" name="EnumerableFiles" />
+    <input asp-for="EnumerableFiles" name="EnumerableFiles">
 
     @Html.EditorFor(m => m.InterfaceFile)
     @Html.EditorFor(m => m.InterfaceFiles)