diff --git a/public/static/app.css b/public/static/app.css
index aac381a..0339e37 100644
--- a/public/static/app.css
+++ b/public/static/app.css
@@ -95,6 +95,14 @@ td.fillCell>* {
   color: var(--yellow);
 }
 
+.keepPlaying {
+  z-index: 1;
+  position: absolute;
+  cursor: pointer;
+  right: 0;
+}
+
+
 /*
   DIALOGS
 */
diff --git a/src/components/Player.vue b/src/components/Player.vue
index 5053261..e8ee84d 100644
--- a/src/components/Player.vue
+++ b/src/components/Player.vue
@@ -147,6 +147,7 @@ export default {
 
       if (this.selectedTrack.parent.progress) {
         this.skipToSecond(this.selectedTrack.parent.progress.progress);
+        this.selectedTrack.parent.progress = undefined;
       } else {
         // Try to fix SAFARI
         this.audio.play();
diff --git a/src/components/dialogs/AlbumViewer.vue b/src/components/dialogs/AlbumViewer.vue
index 0e84074..a4c8cac 100644
--- a/src/components/dialogs/AlbumViewer.vue
+++ b/src/components/dialogs/AlbumViewer.vue
@@ -6,7 +6,8 @@
         <div class="grow z1 center flex-column">
           <img class="glow ma24" :src="cover" @dblclick="dblclick" />
         </div>
-        <awesome-icon icon="star" size="2x" class="favourite ma4" :class="{ active: isFavourite }" @click="toggleFavourite" />
+        <awesome-icon icon="star" size="2x" class="favourite ma4" :class="{ active: isFavourite }" @click="toggleFavourite" title="Favourite" />
+        <awesome-icon icon="play" size="2x" class="keepPlaying ma4 primary-text" @click="playProgress" v-if="selectedAlbum.progress" title="Keep playing" />
         <div id="stats" class="flex-row z1">
           <DropDown v-if="$store.getters['user/isAdministrator']">
             <button class="flat center" :title="visibility_text">
@@ -68,8 +69,6 @@
           </DropDown>
         </div>
       </div>
-      <p v-if="selectedAlbum.progress" @click="playProgress">Progress</p>
-
       <ul id="trackList" class="tracks">
         <li v-for="track in selectedAlbum.tracks" :key="track._id">
           <TrackItem :track="track" :showCover="false" />
@@ -217,7 +216,9 @@ export default {
       this.$store.dispatch("albums/shareDisable", this.selectedAlbum);
     },
     loadUserProgress() {
-      this.$store.dispatch("user/getProgress", this.selectedAlbum);
+      console.log(this.selectedTrack);
+      if (this.selectedTrack.parent._id != this.selectedAlbum._id)
+        this.$store.dispatch("user/getProgress", this.selectedAlbum);
     }
   },
   computed: {