diff --git a/addons/wiki/wiki.py b/addons/wiki/wiki.py
index d82ae8e41b6..2cf22170cec 100644
--- a/addons/wiki/wiki.py
+++ b/addons/wiki/wiki.py
@@ -206,7 +206,7 @@ class History(osv.osv):
 
     _name = "wiki.wiki.history"
     _description = "Wiki History"
-    _rec_name = "date_time"
+    _rec_name = "summary"
     _order = 'id DESC'
 
     _columns = {
@@ -230,8 +230,13 @@ class History(osv.osv):
         history_pool = self.pool.get('wiki.wiki.history')
         text1 = history_pool.read(cr, uid, [v1], ['text_area'])[0]['text_area']
         text2 = history_pool.read(cr, uid, [v2], ['text_area'])[0]['text_area']
-        line1 = text1.splitlines(1)
-        line2 = text2.splitlines(1)
+        line1 = line2 = ''
+        if text1:
+            line1 = text1.splitlines(1)
+        if text2:
+            line2 = text2.splitlines(1)
+        if (not line1 and not line2) or (line1 == line2):
+            raise osv.except_osv(_('Warning !'), _('There are no chnages in revisions'))
         diff = difflib.HtmlDiff()
         return diff.make_file(line1, line2, "Revision-%s" % (v1), "Revision-%s" % (v2), context=False)
 
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index a22267bd52a..5c9aa842e98 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -232,7 +232,7 @@
                     <field name="wiki_id" select="1" colspan="4"/>
                     <field name="summary" select="1" colspan="4"/>
                     <field name="text_area" select="1" colspan="4" nolabel="1" widget="text_wiki"/>
-                    <field name="create_date" select="1"/>
+                    <field name="create_date" select="1" readonly="1"/>
                     <field name="minor_edit" select="1" groups="base.group_extended"/>
                 </form>
             </field>