diff --git a/src/tangara/audio/track_queue.cpp b/src/tangara/audio/track_queue.cpp
index 05ac0b95..0af8bee0 100644
--- a/src/tangara/audio/track_queue.cpp
+++ b/src/tangara/audio/track_queue.cpp
@@ -304,7 +304,10 @@ auto TrackQueue::next(Reason r) -> void {
       position_ = shuffle_->current();
     } else {
       if (position_ + 1 < totalSize()) {
-        position_++;
+        position_++;  // Next track
+      }
+      else {
+        position_ = 0; // Go to beginning
       }
     }
 
@@ -327,6 +330,9 @@ auto TrackQueue::previous() -> void {
       if (position_ > 0) {
         position_--;
       }
+      else {
+        position_ = totalSize();
+      }
     }
     goTo(position_);
   }