diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlAdapter.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlAdapter.kt
index 1a98cf592..c35bd127a 100644
--- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlAdapter.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlAdapter.kt
@@ -6,7 +6,6 @@ package org.mozilla.fenix.home.sessioncontrol
 
 import android.content.Context
 import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
 import androidx.annotation.DrawableRes
 import androidx.annotation.LayoutRes
@@ -18,6 +17,7 @@ import kotlinx.android.synthetic.main.tab_list_row.*
 import mozilla.components.feature.tab.collections.TabCollection
 import mozilla.components.feature.top.sites.TopSite
 import org.mozilla.fenix.components.tips.Tip
+import org.mozilla.fenix.ext.removeAndDisable
 import org.mozilla.fenix.home.OnboardingState
 import org.mozilla.fenix.home.Tab
 import org.mozilla.fenix.home.sessioncontrol.viewholders.CollectionHeaderViewHolder
@@ -255,7 +255,7 @@ class SessionControlAdapter(
             (holder as TabViewHolder).updateTab(it.tab)
 
             // Always set the visibility to GONE to avoid the play button sticking around from previous draws
-            holder.play_pause_button.visibility = View.GONE
+            holder.play_pause_button.removeAndDisable()
 
             if (it.shouldUpdateHostname) { holder.updateHostname(it.tab.hostname) }
             if (it.shouldUpdateTitle) {
diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TabViewHolder.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TabViewHolder.kt
index d6e020db7..40aba9a29 100644
--- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TabViewHolder.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TabViewHolder.kt
@@ -19,6 +19,8 @@ import org.mozilla.fenix.components.metrics.Event
 import org.mozilla.fenix.ext.components
 import org.mozilla.fenix.ext.increaseTapArea
 import org.mozilla.fenix.ext.loadIntoView
+import org.mozilla.fenix.ext.removeAndDisable
+import org.mozilla.fenix.ext.showAndEnable
 import org.mozilla.fenix.home.Tab
 import org.mozilla.fenix.home.sessioncontrol.TabSessionInteractor
 
@@ -93,10 +95,10 @@ class TabViewHolder(
 
     internal fun updatePlayPauseButton(mediaState: MediaState.State) {
         with(play_pause_button) {
-            visibility = if (mediaState == MediaState.State.PLAYING || mediaState == MediaState.State.PAUSED) {
-                View.VISIBLE
+            if (mediaState == MediaState.State.PLAYING || mediaState == MediaState.State.PAUSED) {
+                this.showAndEnable()
             } else {
-                View.GONE
+                this.removeAndDisable()
             }
 
             if (mediaState == MediaState.State.PLAYING) {