diff --git a/sat_frontends/jp/cmd_blog.py b/sat_frontends/jp/cmd_blog.py
index 0adcfd42..62a63510 100644
--- a/sat_frontends/jp/cmd_blog.py
+++ b/sat_frontends/jp/cmd_blog.py
@@ -570,6 +570,9 @@ class Edit(base.CommandBase, BlogPublishCommon, common.BaseEdit):
                 content, SYNTAX_XHTML, self.current_syntax, False, self.profile
             )
         if content and self.current_syntax == SYNTAX_XHTML:
+            content = content.strip()
+            if not content.startswith('<div>'):
+                content = u'<div>' + content + u'</div>'
             try:
                 from lxml import etree
             except ImportError: