diff --git a/app/src/main/java/pl/jakubweg/PlayerController.java b/app/src/main/java/pl/jakubweg/PlayerController.java
index 0cb79823..d20efc5d 100644
--- a/app/src/main/java/pl/jakubweg/PlayerController.java
+++ b/app/src/main/java/pl/jakubweg/PlayerController.java
@@ -272,6 +272,10 @@ public class PlayerController {
      * Called very high frequency (once every about 100ms), also in background. It sometimes triggers when a video is paused (couple times in the row with the same value)
      */
     public static void setCurrentVideoTimeHighPrecision(final long millis) {
+        if ((millis < lastKnownVideoTime && lastKnownVideoTime >= currentVideoLength) || millis == 0) {
+            SponsorBlockUtils.showShieldButton(); // skipping from end to the video will show the buttons again
+            SponsorBlockUtils.showVoteButton();
+        }
         if (lastKnownVideoTime > 0) {
             lastKnownVideoTime = millis;
             VideoInformation.lastKnownVideoTime = lastKnownVideoTime;
diff --git a/app/src/main/java/pl/jakubweg/ShieldButton.java b/app/src/main/java/pl/jakubweg/ShieldButton.java
index b2774c3b..670174c7 100644
--- a/app/src/main/java/pl/jakubweg/ShieldButton.java
+++ b/app/src/main/java/pl/jakubweg/ShieldButton.java
@@ -103,7 +103,7 @@ public class ShieldButton {
         }
     }
 
-    private static boolean shouldBeShown() {
+    static boolean shouldBeShown() {
         return SponsorBlockSettings.isSponsorBlockEnabled && SponsorBlockSettings.isAddNewSegmentEnabled;
     }
 
diff --git a/app/src/main/java/pl/jakubweg/SponsorBlockSettings.java b/app/src/main/java/pl/jakubweg/SponsorBlockSettings.java
index 91c47e1d..12821f00 100644
--- a/app/src/main/java/pl/jakubweg/SponsorBlockSettings.java
+++ b/app/src/main/java/pl/jakubweg/SponsorBlockSettings.java
@@ -84,13 +84,14 @@ public class SponsorBlockSettings {
             SkipSegmentView.hide();
             NewSegmentHelperLayout.hide();
             SponsorBlockUtils.hideShieldButton();
+            SponsorBlockUtils.hideVoteButton();
             PlayerController.sponsorSegmentsOfCurrentVideo = null;
         } else if (/*isAddNewSegmentEnabled*/false) {
             SponsorBlockUtils.showShieldButton();
         }
 
         isAddNewSegmentEnabled = preferences.getBoolean(PREFERENCES_KEY_NEW_SEGMENT_ENABLED, isAddNewSegmentEnabled);
-        if (!/*isAddNewSegmentEnabled*/false) {
+        if (!isAddNewSegmentEnabled) {
             NewSegmentHelperLayout.hide();
             SponsorBlockUtils.hideShieldButton();
         } else {
diff --git a/app/src/main/java/pl/jakubweg/SponsorBlockUtils.java b/app/src/main/java/pl/jakubweg/SponsorBlockUtils.java
index 6e1c8d56..41e73be8 100644
--- a/app/src/main/java/pl/jakubweg/SponsorBlockUtils.java
+++ b/app/src/main/java/pl/jakubweg/SponsorBlockUtils.java
@@ -296,7 +296,7 @@ public abstract class SponsorBlockUtils {
 
     public static void showShieldButton() {
         View i = ShieldButton._shieldBtn.get();
-        if (i == null) return;
+        if (i == null || !ShieldButton.shouldBeShown()) return;
         i.setVisibility(VISIBLE);
         i.bringToFront();
         i.requestLayout();
@@ -311,7 +311,7 @@ public abstract class SponsorBlockUtils {
 
     public static void showVoteButton() {
         View i = VotingButton._votingButton.get();
-        if (i == null) return;
+        if (i == null || !VotingButton.shouldBeShown()) return;
         i.setVisibility(VISIBLE);
         i.bringToFront();
         i.requestLayout();
diff --git a/app/src/main/java/pl/jakubweg/VotingButton.java b/app/src/main/java/pl/jakubweg/VotingButton.java
index 215b49c7..b0bd09e6 100644
--- a/app/src/main/java/pl/jakubweg/VotingButton.java
+++ b/app/src/main/java/pl/jakubweg/VotingButton.java
@@ -103,7 +103,7 @@ public class VotingButton {
         }
     }
 
-    private static boolean shouldBeShown() {
+    static boolean shouldBeShown() {
         return SponsorBlockSettings.isVotingEnabled && SponsorBlockSettings.isSponsorBlockEnabled;
     }