diff --git a/src/App.vue b/src/App.vue
index 324da03..cad45f6 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -3,7 +3,7 @@
 		<GPodder v-if="!AppConfig.repod.gpodder" />
 		<Subscriptions v-if="AppConfig.repod.gpodder" />
 		<router-view v-if="AppConfig.repod.gpodder" :key="$route.path" />
-		<Bar v-if="$route.params.url" />
+		<Bar />
 	</NcContent>
 </template>
 
diff --git a/src/components/Atoms/List.vue b/src/components/Atoms/List.vue
index c476aa2..e64d5c6 100644
--- a/src/components/Atoms/List.vue
+++ b/src/components/Atoms/List.vue
@@ -1,5 +1,5 @@
 <template>
-	<ul :style="{marginBottom: episode ? '6rem' : 'auto'}">
+	<ul :class="episode ? 'margin' : ''">
 		<slot />
 	</ul>
 </template>
@@ -14,3 +14,9 @@ export default {
 	},
 }
 </script>
+
+<style scoped>
+	.margin {
+		margin-bottom: 6rem;
+	}
+</style>
diff --git a/src/components/Feed/Episodes.vue b/src/components/Feed/Episodes.vue
index a601179..ef1a28e 100644
--- a/src/components/Feed/Episodes.vue
+++ b/src/components/Feed/Episodes.vue
@@ -5,10 +5,10 @@
 			<NcListItem v-for="episode in episodes"
 				:key="episode.episodeGuid"
 				:active="isCurrentEpisode(episode)"
+				:class="episode.episodeAction && episode.episodeAction.position >= episode.episodeAction.total ? 'ended': ''"
 				:details="formatTimeAgo(new Date(episode.episodePubDate.date))"
 				:force-display-actions="true"
 				:name="episode.episodeName"
-				:style="{opacity: episode.episodeAction && episode.episodeAction.position >= episode.episodeAction.total ? '.5' : 1}"
 				:title="episode.episodeDescription">
 				<template #icon>
 					<NcAvatar :display-name="episode.episodeName"
@@ -96,3 +96,9 @@ export default {
 	},
 }
 </script>
+
+<style scoped>
+	.ended {
+		opacity: .5;
+	}
+</style>
diff --git a/src/store/player.js b/src/store/player.js
index 6dc8905..f275aab 100644
--- a/src/store/player.js
+++ b/src/store/player.js
@@ -29,7 +29,7 @@ export const player = {
 		action: (state, action) => {
 			state.episode.action = action
 
-			if (action && action.position) {
+			if (action && action.position && action.position < action.total) {
 				audio.currentTime = action.position
 			}
 		},
@@ -48,7 +48,7 @@ export const player = {
 				audio.load()
 				audio.play()
 
-				if (episode.action && episode.action.position) {
+				if (episode.action && episode.action.position && episode.action.position < episode.action.total) {
 					audio.currentTime = episode.action.position
 				}
 			} else {