diff --git a/lib/views/home/studio/studio_details/widgets/details_tab_bar.dart b/lib/views/home/studio/studio_details/widgets/details_tab_bar.dart
index a16754a..ba160e7 100644
--- a/lib/views/home/studio/studio_details/widgets/details_tab_bar.dart
+++ b/lib/views/home/studio/studio_details/widgets/details_tab_bar.dart
@@ -89,7 +89,7 @@ class _TabItem extends StatelessWidget {
       }
       return Theme.of(context).colorScheme.focusedBorder;
     }
-    return Theme.of(context).colorScheme.border;
+    return Theme.of(context).colorScheme.hint;
   }
 
   @override
diff --git a/lib/views/home/widgets/audio/audio_player_widget.dart b/lib/views/home/widgets/audio/audio_player_widget.dart
index 78db446..79d1aff 100644
--- a/lib/views/home/widgets/audio/audio_player_widget.dart
+++ b/lib/views/home/widgets/audio/audio_player_widget.dart
@@ -285,6 +285,11 @@ class AudioPlayerWidget extends StatelessWidget {
                 timerValue--;
                 if (timerValue == 0) {
                   MediaService.audioPlayer.stop();
+                  state.stopOnPodcastEnds = false;
+                  state.timer?.cancel();
+                  state.timer = null;
+                  state.timerValue = 10;
+                  state.update();
                 }
               },
             );