diff --git a/src/Text/Pandoc/Writers/LaTeX.hs b/src/Text/Pandoc/Writers/LaTeX.hs
index f3d7af7e5..ea3d471fe 100644
--- a/src/Text/Pandoc/Writers/LaTeX.hs
+++ b/src/Text/Pandoc/Writers/LaTeX.hs
@@ -216,8 +216,9 @@ blockToLaTeX (CodeBlock (_,classes,keyvalAttr) str) = do
           | null params = empty
           | otherwise   = "[" <> hsep (intersperse "," (map text params)) <>
                           "]"
-  return $ "\\begin{" <> text env <> "}" <> printParams $$ flush (text str) $$
-           "\\end{" <> text env <> "}" $$ cr   -- final cr needed because of footnotes
+  return $ flush ("\\begin{" <> text env <> "}" <> printParams $$ text str $$
+           "\\end{" <> text env <> "}") $$ cr
+           -- final cr needed because of footnotes
 blockToLaTeX (RawBlock "latex" x) = return $ text x <> blankline
 blockToLaTeX (RawBlock _ _) = return empty
 blockToLaTeX (BulletList lst) = do
diff --git a/tests/writer.latex b/tests/writer.latex
index ff6e9d58b..15a45a521 100644
--- a/tests/writer.latex
+++ b/tests/writer.latex
@@ -808,9 +808,9 @@ Here is a footnote reference,\footnote{Here is the footnote. It can go
   Subsequent blocks are indented to show that they belong to the footnote (as
   with list items).
 
-  \begin{Verbatim}
+\begin{Verbatim}
   { <code> }
-  \end{Verbatim}
+\end{Verbatim}
   If you want, you can indent every line, but you can also be lazy and just
   indent the first line of each block.} This should \emph{not} be a footnote
 reference, because it contains a space.{[}\^{}my note{]} Here is an inline