diff --git a/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/CSharpCodeWriter.cs b/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/CSharpCodeWriter.cs
index e4fff79c9a..d55a490755 100644
--- a/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/CSharpCodeWriter.cs
+++ b/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/CSharpCodeWriter.cs
@@ -129,18 +129,19 @@ namespace Microsoft.AspNet.Razor.Generator.Compiler.CSharp
 
         public CSharpCodeWriter WriteUsing(string name)
         {
-            int throwAway;
-
-            return WriteUsing(name, out throwAway);
+            return WriteUsing(name, endLine: true);
         }
 
-        public CSharpCodeWriter WriteUsing(string name, out int writeSize)
+        public CSharpCodeWriter WriteUsing(string name, bool endLine)
         {
-            string output = String.Format("using {0};", name);
+            Write(String.Format("using {0}", name));
 
-            writeSize = output.Length;
+            if(endLine)
+            {
+                WriteLine(";");
+            }
 
-            return WriteLine(output);
+            return this;
         }
 
         public CSharpCodeWriter WriteLineDefaultDirective()
diff --git a/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/Visitors/CSharpUsingVisitor.cs b/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/Visitors/CSharpUsingVisitor.cs
index 5bf7767911..185c7080a8 100644
--- a/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/Visitors/CSharpUsingVisitor.cs
+++ b/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/Visitors/CSharpUsingVisitor.cs
@@ -14,11 +14,14 @@ namespace Microsoft.AspNet.Razor.Generator.Compiler.CSharp
 
         protected override void Visit(UsingChunk chunk)
         {
+            ImportedUsings.Add(chunk.Namespace);
+
             using (Writer.BuildLineMapping(chunk.Start, chunk.Association.Length, Context.SourceFile))
             {
-                ImportedUsings.Add(chunk.Namespace);
-                Writer.WriteUsing(chunk.Namespace);
+                Writer.WriteUsing(chunk.Namespace, endLine: false);
             }
+
+            Writer.WriteLine(";");
         }
     }
 }