diff --git a/app/playlists.py b/app/playlists.py
index 5ec5f7f..072c84f 100644
--- a/app/playlists.py
+++ b/app/playlists.py
@@ -1029,11 +1029,11 @@ class PlaylistTab(QTableWidget):
             if not playlist_row:
                 continue
             note_text = playlist_row.note
+            note_colour = None
             if not note_text:
                 note_text = ""
             # Get note colour
-            note_colour = None
-            if note_text:
+            else:
                 note_colour = NoteColours.get_colour(session, note_text)
 
             # Get track if there is one
@@ -1152,7 +1152,7 @@ class PlaylistTab(QTableWidget):
                         self._set_row_start_time(row, next_start_time)
                         if track.duration:
                             next_start_time = self._calculate_end_time(
-                                start_time, track.duration)
+                                next_start_time, track.duration)
                         # Set end time
                         self._set_row_end_time(row, next_start_time)
                     else: