diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index f674eb34..04454097 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -69,9 +69,12 @@
   "hitGoBack": {
     "message": "Hit unskip to get to where you came from."
   },
-  "goBack": {
+  "unskip": {
     "message": "Unskip"
   },
+  "reskip": {
+    "message": "Reskip"
+  },
   "paused": {
     "message": "Paused"
   },
diff --git a/content.js b/content.js
index c71326cd..dada9ed0 100644
--- a/content.js
+++ b/content.js
@@ -515,12 +515,17 @@ function skipToTime(v, index, sponsorTimes, openNotice) {
   }
 }
 
-function goBackToPreviousTime(sponsorTime) {
+function unskipSponsorTime(UUID) {
   if (sponsorTimes != null) {
     //add a tiny bit of time to make sure it is not skipped again
-    v.currentTime = sponsorTimes[UUIDs.indexOf(sponsorTime.UUID)][0] + 0.001;
+    v.currentTime = sponsorTimes[UUIDs.indexOf(UUID)][0] + 0.001;
+  }
+}
 
-    sponsorTime.closeSkipNotice();
+function reskipSponsorTime(UUID) {
+  if (sponsorTimes != null) {
+    //add a tiny bit of time to make sure it is not skipped again
+    v.currentTime = sponsorTimes[UUIDs.indexOf(UUID)][1];
   }
 }
 
diff --git a/utils/skipNotice.js b/utils/skipNotice.js
index 01bba911..48ca70a9 100644
--- a/utils/skipNotice.js
+++ b/utils/skipNotice.js
@@ -6,11 +6,15 @@ class SkipNotice {
         this.parent = parent;
         this.UUID = UUID;
 
+        this.maxCountdownTime = () => 4;
         //the countdown until this notice closes
-        this.countdownTime = 4;
+        this.countdownTime = this.maxCountdownTime();
         //the id for the setInterval running the countdown
         this.countdownInterval = -1;
 
+        //the unskip button's callback
+        this.unskipCallback = this.unskip.bind(this);
+
         //add notice
         let amountOfPreviousNotices = document.getElementsByClassName("sponsorSkipNotice").length;
 
@@ -111,9 +115,10 @@ class SkipNotice {
         unskipContainer.className = "sponsorSkipNoticeUnskipSection";
 
         let unskipButton = document.createElement("button");
-        unskipButton.innerText = chrome.i18n.getMessage("goBack");
+        unskipButton.id = "sponsorSkipUnskipButton" + this.UUID;
+        unskipButton.innerText = chrome.i18n.getMessage("unskip");
         unskipButton.className = "sponsorSkipObject sponsorSkipNoticeButton";
-        unskipButton.addEventListener("click", () => goBackToPreviousTime(this));
+        unskipButton.addEventListener("click", this.unskipCallback);
 
         unskipButton.style.marginLeft = "4px";
 
@@ -190,7 +195,7 @@ class SkipNotice {
         this.countdownInterval = -1;
 
         //reset countdown
-        this.countdownTime = 4;
+        this.countdownTime = this.maxCountdownTime();
         
         //inform the user
         let timeLeft = document.getElementById("sponsorSkipNoticeTimeLeft" + this.UUID);
@@ -217,6 +222,48 @@ class SkipNotice {
         timeLeft.innerText = this.countdownTime + "s";
     }
 
+    unskip() {
+        unskipSponsorTime(this.UUID);
+
+        //change unskip button to a reskip button
+        let unskipButton = document.getElementById("sponsorSkipUnskipButton" + this.UUID);
+        unskipButton.innerText = chrome.i18n.getMessage("reskip");
+        unskipButton.removeEventListener("click", this.unskipCallback);
+
+        //setup new callback
+        this.unskipCallback = this.reskip.bind(this);
+        unskipButton.addEventListener("click", this.unskipCallback);
+
+        //change max duration to however much of the sponsor is left
+        this.maxCountdownTime = function() {
+            let sponsorTime = sponsorTimes[UUIDs.indexOf(this.UUID)];
+            let duration = Math.round(sponsorTime[1] - v.currentTime);
+
+            return Math.max(duration, 4);
+        };
+
+        this.countdownTime = this.maxCountdownTime();
+        this.updateTimerDisplay();
+    }
+
+    reskip() {
+        reskipSponsorTime(this.UUID);
+
+        //change unskip button to a reskip button
+        let unskipButton = document.getElementById("sponsorSkipUnskipButton" + this.UUID);
+        unskipButton.innerText = chrome.i18n.getMessage("unskip");
+        unskipButton.removeEventListener("click", this.unskipCallback);
+
+        //setup new callback
+        this.unskipCallback = this.unskip.bind(this);
+        unskipButton.addEventListener("click", this.unskipCallback);
+
+        //reset duration
+        this.maxCountdownTime = () => 4;
+        this.countdownTime = this.maxCountdownTime();
+        this.updateTimerDisplay();
+    }
+
     afterDownvote() {
         this.addVoteButtonInfo(chrome.i18n.getMessage("Voted"));
         this.addNoticeInfoMessage(chrome.i18n.getMessage("hitGoBack"));