diff --git a/app/phone/src/main/java/dev/jdtech/jellyfin/PlayerActivity.kt b/app/phone/src/main/java/dev/jdtech/jellyfin/PlayerActivity.kt
index 3dd2c133..3add87ab 100644
--- a/app/phone/src/main/java/dev/jdtech/jellyfin/PlayerActivity.kt
+++ b/app/phone/src/main/java/dev/jdtech/jellyfin/PlayerActivity.kt
@@ -37,6 +37,7 @@ import dagger.hilt.android.AndroidEntryPoint
 import dev.jdtech.jellyfin.databinding.ActivityPlayerBinding
 import dev.jdtech.jellyfin.dialogs.SpeedSelectionDialogFragment
 import dev.jdtech.jellyfin.dialogs.TrackSelectionDialogFragment
+import dev.jdtech.jellyfin.models.FindroidSegment
 import dev.jdtech.jellyfin.utils.PlayerGestureHelper
 import dev.jdtech.jellyfin.utils.PreviewScrubListener
 import dev.jdtech.jellyfin.viewmodels.PlayerActivityViewModel
@@ -59,6 +60,8 @@ class PlayerActivity : BasePlayerActivity() {
     override val viewModel: PlayerActivityViewModel by viewModels()
     private var previewScrubListener: PreviewScrubListener? = null
     private var wasZoom: Boolean = false
+    private var oldSegment: FindroidSegment? = null
+    private var buttonPressed: Boolean = false
 
     private val isPipSupported by lazy {
         // Check if device has PiP feature
@@ -120,7 +123,7 @@ class PlayerActivity : BasePlayerActivity() {
         val audioButton = binding.playerView.findViewById<ImageButton>(R.id.btn_audio_track)
         val subtitleButton = binding.playerView.findViewById<ImageButton>(R.id.btn_subtitle)
         val speedButton = binding.playerView.findViewById<ImageButton>(R.id.btn_speed)
-        val skipIntroButton = binding.playerView.findViewById<Button>(R.id.btn_skip_intro)
+        val skipButton = binding.playerView.findViewById<Button>(R.id.btn_skip_intro)
         val pipButton = binding.playerView.findViewById<ImageButton>(R.id.btn_pip)
         val lockButton = binding.playerView.findViewById<ImageButton>(R.id.btn_lockview)
         val unlockButton = binding.playerView.findViewById<ImageButton>(R.id.btn_unlock)
@@ -134,30 +137,42 @@ class PlayerActivity : BasePlayerActivity() {
                             // Title
                             videoNameTextView.text = currentItemTitle
 
-                            // Skip Intro button
-                            // Visibility
-                            skipIntroButton.isVisible = !isInPictureInPictureMode && showSkip == true
-                            // Text
+                            // Skip button
+                            // Button Visibility
+                            if (currentSegment != oldSegment) buttonPressed = false
+                            skipButton.isVisible =
+                                !isInPictureInPictureMode && !buttonPressed && (showSkip == true || (binding.playerView.isControllerFullyVisible && currentSegment?.skip == true))
+                            binding.playerView.setControllerVisibilityListener(
+                                PlayerView.ControllerVisibilityListener { visibility ->
+                                    skipButton.isVisible =
+                                        !isInPictureInPictureMode && !buttonPressed && (showSkip == true || visibility == View.VISIBLE && currentSegment?.skip == true)
+                                },
+                            )
+                            // Button Text
                             when (currentSegment?.type) {
                                 "intro" -> {
-                                    skipIntroButton.text = getString(CoreR.string.skip_intro_button)
+                                    skipButton.text =
+                                        getString(CoreR.string.skip_intro_button)
                                 }
+
                                 "credit" -> {
-                                    skipIntroButton.text = if (binding.playerView.player?.hasNextMediaItem() == true) {
-                                        getString(CoreR.string.skip_credit_button)
-                                    } else {
-                                        getString(CoreR.string.skip_credit_button_last)
-                                    }
+                                    skipButton.text =
+                                        if (binding.playerView.player?.hasNextMediaItem() == true) {
+                                            getString(CoreR.string.skip_credit_button)
+                                        } else {
+                                            getString(CoreR.string.skip_credit_button_last)
+                                        }
                                 }
                             }
                             // onClick
-                            skipIntroButton.setOnClickListener {
+                            skipButton.setOnClickListener {
                                 when (currentSegment?.type) {
                                     "intro" -> {
                                         currentSegment?.let {
                                             binding.playerView.player?.seekTo((it.endTime * 1000).toLong())
                                         }
                                     }
+
                                     "credit" -> {
                                         if (binding.playerView.player?.hasNextMediaItem() == true) {
                                             binding.playerView.player?.seekToNext()
@@ -166,8 +181,10 @@ class PlayerActivity : BasePlayerActivity() {
                                         }
                                     }
                                 }
-                                skipIntroButton.isVisible = false
+                                buttonPressed = true
+                                skipButton.isVisible = false
                             }
+                            oldSegment = currentSegment
 
                             // Trick Play
                             previewScrubListener?.let {
diff --git a/app/phone/src/main/res/layout/exo_player_skip_control.xml b/app/phone/src/main/res/layout/exo_player_skip_control.xml
new file mode 100644
index 00000000..eb730d44
--- /dev/null
+++ b/app/phone/src/main/res/layout/exo_player_skip_control.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+        <Button
+            android:id="@+id/btn_skip_intro"
+            style="@style/Widget.Material3.Button.OutlinedButton.Icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="end|bottom"
+            android:layout_marginEnd="24dp"
+            android:layout_marginBottom="64dp"
+            android:textColor="@android:color/white"
+            android:visibility="gone"
+            app:backgroundTint="@color/player_background"
+            app:icon="@drawable/ic_skip_forward"
+            app:iconGravity="end"
+            app:iconTint="@android:color/white"
+            app:strokeColor="@android:color/white"
+            tools:visibility="visible" />
+
+</FrameLayout>
diff --git a/app/phone/src/main/res/layout/exo_player_view.xml b/app/phone/src/main/res/layout/exo_player_view.xml
index 554c0ca3..9d6b8bfc 100644
--- a/app/phone/src/main/res/layout/exo_player_view.xml
+++ b/app/phone/src/main/res/layout/exo_player_view.xml
@@ -48,23 +48,6 @@
             android:textColor="@android:color/white"
             android:textSize="14sp" />
 
-        <Button
-            android:id="@+id/btn_skip_intro"
-            style="@style/Widget.Material3.Button.OutlinedButton.Icon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="end|bottom"
-            android:layout_marginEnd="24dp"
-            android:layout_marginBottom="64dp"
-            android:textColor="@android:color/white"
-            android:visibility="gone"
-            app:backgroundTint="@color/player_background"
-            app:icon="@drawable/ic_skip_forward"
-            app:iconGravity="end"
-            app:iconTint="@android:color/white"
-            app:strokeColor="@android:color/white"
-            tools:visibility="visible" />
-
     </androidx.media3.ui.AspectRatioFrameLayout>
 
     <androidx.media3.ui.SubtitleView
@@ -88,4 +71,10 @@
         android:layout_height="match_parent"
         app:animation_enabled="false"/>
 
+    <include
+        layout="@layout/exo_player_skip_control"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        />
+
 </merge>
\ No newline at end of file
diff --git a/player/video/src/main/java/dev/jdtech/jellyfin/viewmodels/PlayerActivityViewModel.kt b/player/video/src/main/java/dev/jdtech/jellyfin/viewmodels/PlayerActivityViewModel.kt
index 9fc9b233..ec78dc9d 100644
--- a/player/video/src/main/java/dev/jdtech/jellyfin/viewmodels/PlayerActivityViewModel.kt
+++ b/player/video/src/main/java/dev/jdtech/jellyfin/viewmodels/PlayerActivityViewModel.kt
@@ -247,11 +247,11 @@ constructor(
                     val itemId = UUID.fromString(currentMediaItem.mediaId)
                     val seconds = player.currentPosition / 1000.0
 
-                    val currentSegment = segments[itemId]?.find { segment -> seconds in segment.startTime..segment.endTime }
+                    val currentSegment = segments[itemId]?.find { segment -> seconds in segment.startTime..<segment.endTime }
                     _uiState.update { it.copy(currentSegment = currentSegment) }
                     Timber.tag("SegmentInfo").d("currentSegment: %s", currentSegment)
 
-                    val showSkip = currentSegment?.let { it.skip && seconds in it.showAt..it.hideAt } ?: false
+                    val showSkip = currentSegment?.let { it.skip && seconds in it.showAt..<it.hideAt } ?: false
                     _uiState.update { it.copy(showSkip = showSkip) }
                 }
                 handler.postDelayed(this, 1000L)