diff --git a/src/components/SponsorTimeEditComponent.tsx b/src/components/SponsorTimeEditComponent.tsx
index 5d111617..2679a50c 100644
--- a/src/components/SponsorTimeEditComponent.tsx
+++ b/src/components/SponsorTimeEditComponent.tsx
@@ -261,6 +261,7 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
 
         if (utils.getCategoryActionType(event.target.value as Category) === CategoryActionType.POI) {
             this.setTimeTo(1, null);
+            this.props.contentContainer().changeStartSponsorButton(true, true);
         }
         
         this.saveEditTimes();
@@ -359,7 +360,7 @@ class SponsorTimeEditComponent extends React.Component<SponsorTimeEditProps, Spo
         //if it is not a complete sponsor time
         if (sponsorTimes[index].segment.length < 2) {
             //update video player
-            this.props.contentContainer().changeStartSponsorButton(true, false);
+            this.props.contentContainer().changeStartSponsorButton(true, true);
         }
   
         sponsorTimes.splice(index, 1);
diff --git a/src/content.ts b/src/content.ts
index 2434c617..549236c7 100644
--- a/src/content.ts
+++ b/src/content.ts
@@ -1220,25 +1220,18 @@ async function changeStartSponsorButton(showStartSponsor: boolean, uploadButtonV
     //if it isn't visible, there is no data
     const shouldHide = (uploadButtonVisible && !(Config.config.hideDeleteButtonPlayerControls || onInvidious)) ? "unset" : "none"
     document.getElementById("deleteButton").style.display = shouldHide;
+    if (!Config.config.hideUploadButtonPlayerControls && !onInvidious) {
+        document.getElementById("submitButton").style.display = shouldHide;
+    }
 
     if (showStartSponsor) {
         showingStartSponsor = true;
         (<HTMLImageElement> document.getElementById("startSponsorImage")).src = chrome.extension.getURL("icons/PlayerStartIconSponsorBlocker256px.png");
         document.getElementById("startSponsorButton").setAttribute("title", chrome.i18n.getMessage("sponsorStart"));
-
-        if (document.getElementById("startSponsorImage").style.display != "none" && uploadButtonVisible && !Config.config.hideUploadButtonPlayerControls && !onInvidious) {
-            document.getElementById("submitButton").style.display = "unset";
-        } else if (!uploadButtonVisible || onInvidious) {
-            //disable submit button
-            document.getElementById("submitButton").style.display = "none";
-        }
     } else {
         showingStartSponsor = false;
         (<HTMLImageElement> document.getElementById("startSponsorImage")).src = chrome.extension.getURL("icons/PlayerStopIconSponsorBlocker256px.png");
         document.getElementById("startSponsorButton").setAttribute("title", chrome.i18n.getMessage("sponsorEND"));
-
-        //disable submit button
-        document.getElementById("submitButton").style.display = "none";
     }
 }