diff --git a/lib/widgets/journal_list.dart b/lib/widgets/journal_list.dart
index 1a4039a8..e907c4bb 100644
--- a/lib/widgets/journal_list.dart
+++ b/lib/widgets/journal_list.dart
@@ -143,16 +143,30 @@ class _JournalListState extends State<JournalList> {
 
   Widget _buildRow(BuildContext context, Note note) {
     var textTheme = Theme.of(context).textTheme;
-
-    var title = note.title ?? note.fileName;
+    var title = note.title;
     Widget titleWidget = Text(title, style: textTheme.title);
-    Widget trailing;
+    if (title.isEmpty) {
+      var date = note.modified ?? note.created;
+      if (date != null) {
+        var formatter = DateFormat('dd MMM, yyyy  ');
+        var dateStr = formatter.format(date);
 
-    var date = note.modified ?? note.created;
-    if (date != null) {
-      var formatter = DateFormat('dd MMM, yyyy');
-      var dateStr = formatter.format(date);
-      trailing = Text(dateStr, style: textTheme.caption);
+        var timeFormatter = DateFormat('Hm');
+        var time = timeFormatter.format(date);
+
+        var timeColor = textTheme.body1.color.withAlpha(100);
+
+        titleWidget = Row(
+          children: <Widget>[
+            Text(dateStr, style: textTheme.title),
+            Text(time, style: textTheme.body1.copyWith(color: timeColor)),
+          ],
+          crossAxisAlignment: CrossAxisAlignment.baseline,
+          textBaseline: TextBaseline.alphabetic,
+        );
+      } else {
+        titleWidget = Text(note.fileName, style: textTheme.title);
+      }
     }
 
     var body = stripMarkdownFormatting(note.body);
@@ -170,7 +184,6 @@ class _JournalListState extends State<JournalList> {
     var tile = ListTile(
       isThreeLine: true,
       title: titleWidget,
-      trailing: trailing,
       subtitle: Column(
         children: children,
         crossAxisAlignment: CrossAxisAlignment.start,