diff --git a/templates/page.tmpl b/templates/page.tmpl
index 9cef35dc6..e22169323 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -11,6 +11,7 @@
 <TMPL_VAR TITLE>
 </h1>
 
+<p>
 <TMPL_IF NAME="EDITURL">
 <a href="<TMPL_VAR EDITURL>">Edit</a>&nbsp;
 </TMPL_IF>
@@ -28,6 +29,7 @@
 </TMPL_IF>
 
 <TMPL_VAR DISCUSSIONLINK><br />
+</p>
 
 <hr />
 <TMPL_VAR CONTENT>