diff --git a/public/popup.html b/public/popup.html
index a31269c6..df8b2e03 100644
--- a/public/popup.html
+++ b/public/popup.html
@@ -44,12 +44,12 @@
             </span>
           </div>
           <div id="issueReporterTimeButtons"></div>
-          <div id="issueReporterImportExport" class="hidden">
+          <div id="issueReporterImportExport">
             <div id="importExportButtons">
-              <button id="importSegmentsButton" title="__MSG_importSegments__" class="hidden">
+              <button id="importSegmentsButton" title="__MSG_importSegments__">
                 <img src="/icons/import.svg" alt="Refresh icon" id="importSegments" />
               </button>
-              <button id="exportSegmentsButton" title="__MSG_exportSegments__">
+              <button id="exportSegmentsButton" class="hidden" title="__MSG_exportSegments__">
                 <img src="/icons/export.svg" alt="Export icon" id="exportSegments" />
               </button>
             </div>
diff --git a/src/content.ts b/src/content.ts
index a1f22fbc..b60f0a2b 100644
--- a/src/content.ts
+++ b/src/content.ts
@@ -248,7 +248,8 @@ function messageListener(request: Message, sender: unknown, sendResponse: (respo
             for (const segment of importedSegments) {
                 if (!sponsorTimesSubmitting.concat(sponsorTimes ?? []).some(
                         (s) => Math.abs(s.segment[0] - segment.segment[0]) < 1 
-                            && Math.abs(s.segment[1] - segment.segment[1]) < 1)) {
+                            && Math.abs(s.segment[1] - segment.segment[1]) < 1)
+                        && (segment.category !== "chapter" || utils.getCategorySelection("chapter"))) {
                     sponsorTimesSubmitting.push(segment);
                     addedSegments = true;
                 }
diff --git a/src/popup.ts b/src/popup.ts
index e357034c..c32fb978 100644
--- a/src/popup.ts
+++ b/src/popup.ts
@@ -527,12 +527,9 @@ async function runThePopup(messageListener?: MessageListener): Promise<void> {
         }
 
         if (downloadedTimes.length > 0) {
-            PageElements.issueReporterImportExport.classList.remove("hidden");
-            if (utils.getCategorySelection("chapter")?.option === CategorySkipOption.ShowOverlay) {
-                PageElements.importSegmentsButton.classList.remove("hidden");
-            }
+            PageElements.exportSegmentsButton.classList.remove("hidden");
         } else { 
-            PageElements.issueReporterImportExport.classList.add("hidden");
+            PageElements.exportSegmentsButton.classList.add("hidden");
         }
 
         const isVip = Config.config.isVip;