diff --git a/lib/episodes/episode_detail.dart b/lib/episodes/episode_detail.dart
index cd6982e..719d572 100644
--- a/lib/episodes/episode_detail.dart
+++ b/lib/episodes/episode_detail.dart
@@ -378,7 +378,12 @@ class _EpisodeDetailState extends State<EpisodeDetail> {
                       ),
                     );
                   }),
-              Container(child: PlayerWidget(playerKey: _playerKey)),
+              Selector<AudioPlayerNotifier, EpisodeBrief>(
+                  selector: (_, audio) => audio.episode,
+                  builder: (_, data, __) => Container(
+                      child: PlayerWidget(
+                          playerKey: _playerKey,
+                          isPlayingPage: data == widget.episodeItem))),
             ],
           ),
         ),
@@ -623,8 +628,7 @@ class _MenuBarState extends State<MenuBar> {
           Selector<AudioPlayerNotifier, Tuple2<EpisodeBrief, bool>>(
             selector: (_, audio) => Tuple2(audio.episode, audio.playerRunning),
             builder: (_, data, __) {
-              return (widget.episodeItem.title == data.item1?.title &&
-                      data.item2)
+              return (widget.episodeItem == data.item1 && data.item2)
                   ? Container(
                       padding: EdgeInsets.only(right: 30),
                       child: SizedBox(
diff --git a/lib/home/audioplayer.dart b/lib/home/audioplayer.dart
index 234d3cb..54ad9ea 100644
--- a/lib/home/audioplayer.dart
+++ b/lib/home/audioplayer.dart
@@ -44,8 +44,9 @@ const List kMinPlayerHeight = <double>[70.0, 75.0, 80.0];
 const List kMaxPlayerHeight = <double>[300.0, 325.0, 350.0];
 
 class PlayerWidget extends StatelessWidget {
-  PlayerWidget({this.playerKey});
+  PlayerWidget({this.playerKey, this.isPlayingPage = false});
   final GlobalKey<AudioPanelState> playerKey;
+  final bool isPlayingPage;
   Widget _miniPanel(BuildContext context) {
     var audio = Provider.of<AudioPlayerNotifier>(context, listen: false);
     final s = context.s;
@@ -231,6 +232,7 @@ class PlayerWidget extends StatelessWidget {
               miniPanel: _miniPanel(context),
               expandedPanel: ControlPanel(
                 maxHeight: maxHeight,
+                isPlayingPage: isPlayingPage,
                 onExpand: () {
                   playerKey.currentState.scrollToTop();
                 },
@@ -934,11 +936,17 @@ class SleepModeState extends State<SleepMode>
 }
 
 class ControlPanel extends StatefulWidget {
-  ControlPanel({this.onExpand, this.onClose, this.maxHeight, Key key})
+  ControlPanel(
+      {this.onExpand,
+      this.onClose,
+      this.maxHeight,
+      this.isPlayingPage = false,
+      Key key})
       : super(key: key);
   final VoidCallback onExpand;
   final VoidCallback onClose;
   final double maxHeight;
+  final bool isPlayingPage;
   @override
   _ControlPanelState createState() => _ControlPanelState();
 }
@@ -1324,12 +1332,14 @@ class _ControlPanelState extends State<ControlPanel>
                                       child: InkWell(
                                         onTap: () async {
                                           widget.onClose();
-                                          Navigator.push(
-                                              context,
-                                              FadeRoute(
-                                                  page: EpisodeDetail(
-                                                      episodeItem: data.item1,
-                                                      heroTag: 'playpanel')));
+                                          if (!widget.isPlayingPage) {
+                                            Navigator.push(
+                                                context,
+                                                FadeRoute(
+                                                    page: EpisodeDetail(
+                                                        episodeItem: data.item1,
+                                                        heroTag: 'playpanel')));
+                                          }
                                         },
                                         child: Row(
                                           children: [