diff --git a/src/components/playerButtons/PlayerButtonGroupComponent.tsx b/src/components/playerButtons/PlayerButtonGroupComponent.tsx
index 7c1ee9a5..afc2338e 100644
--- a/src/components/playerButtons/PlayerButtonGroupComponent.tsx
+++ b/src/components/playerButtons/PlayerButtonGroupComponent.tsx
@@ -19,6 +19,19 @@ function PlayerButtonGroupComponent({
     submitCallback,
     infoCallback,
 }: PlayerButtonGroupProps) {
+    const [sponsorTimesSubmitting, setSponsorTimesSubmitting] = React.useState([]);
+
+    React.useEffect(() => {
+        const handleShowInfoButton = (e: CustomEvent) => setSponsorTimesSubmitting(e.detail);
+        window.addEventListener("sponsorTimesSubmittingChange", handleShowInfoButton);
+        return () => window.removeEventListener("sponsorTimesSubmittingChange", handleShowInfoButton);
+    }, []);
+
+    function isSegmentCreationInProgress(): boolean {
+        const segment = sponsorTimesSubmitting[sponsorTimesSubmitting.length - 1];
+        return segment && segment?.segment?.length !== 2;
+    }
+
     function getPopconfirmDescription() {
         const message = chrome.i18n.getMessage("confirmMSG").split("\n");
         return (
@@ -35,15 +48,6 @@ function PlayerButtonGroupComponent({
             <div style={{ display: Config.config.hideVideoPlayerControls ? "none" : "contents" }}>
                 <InfoButtonComponent infoCallback={infoCallback}></InfoButtonComponent>
 
-                {/* <PlayerButtonComponent
-                baseID="info"
-                title="openPopup"
-                imageName="PlayerInfoIconSponsorBlocker.svg"
-                isDraggable={false}
-                show={!Config.config.hideInfoButtonPlayerControls && !document.URL.includes("/embed/")}
-                onClick={infoCallback}
-            ></PlayerButtonComponent> */}
-
                 <PlayerButtonComponent
                     baseID="submit"
                     title="OpenSubmissionMenu"
diff --git a/src/content.ts b/src/content.ts
index 0d31974b..a68c4c8c 100644
--- a/src/content.ts
+++ b/src/content.ts
@@ -1925,6 +1925,8 @@ function updateEditButtonsOnPlayer(): void {
     // Don't try to update the buttons if we aren't on a Bilibili video page
     if (!getVideoID()) return;
 
+    window.dispatchEvent(new CustomEvent("sponsorTimesSubmittingChange", { detail: sponsorTimesSubmitting }));
+
     const creatingSegment = isSegmentCreationInProgress();
     // Show only if there are any segments to submit
     const submitButtonVisible = sponsorTimesSubmitting.length > 0;