diff --git a/src/calibre/gui2/library.py b/src/calibre/gui2/library.py
index 69a835827e..15453127c2 100644
--- a/src/calibre/gui2/library.py
+++ b/src/calibre/gui2/library.py
@@ -285,6 +285,7 @@ class BooksModel(QAbstractTableModel):
                   'authors' : au,
                   'cover'   : self.db.cover(row),
                   'tags'    : tags,
+                  'comments': self.db.comments(row),
                   }
             if series is not None:
                 mi['tag order'] = {series:self.db.books_in_series_of(row)} 
diff --git a/src/calibre/gui2/main.py b/src/calibre/gui2/main.py
index 79d9c02a68..b26e6d92aa 100644
--- a/src/calibre/gui2/main.py
+++ b/src/calibre/gui2/main.py
@@ -626,7 +626,9 @@ class Main(MainWindow, Ui_MainWindow):
                 for a in aus:
                     aus2.extend(a.split('&'))
                 try:
-                    set_metadata(f, MetaInformation(mi['title'], aus2), f.name.rpartition('.')[2])
+                    smi = MetaInformation(mi['title'], aus2)
+                    smi.comments = mi.get('comments', None)
+                    set_metadata(f, smi, f.name.rpartition('.')[2])
                 except:
                     print 'Error setting metadata in book:', mi['title']
                     traceback.print_exc()