diff --git a/manifest.json b/manifest.json
index 0f427829ab..8c43cd9d14 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "SponsorBlock for YouTube - Skip Sponsorships",
   "short_name": "SponsorBlock",
-  "version": "1.0.21",
+  "version": "1.0.22",
   "description": "Skip over sponsorship on YouTube videos. Report sponsors on videos you watch to save the time of others.",
   "content_scripts": [
     {
diff --git a/popup.js b/popup.js
index 9548230537..2a321bfea4 100644
--- a/popup.js
+++ b/popup.js
@@ -451,6 +451,9 @@ function runThePopup() {
       //already open
       return;
     }
+
+    //hide submit button
+    document.getElementById("submitTimesContainer").style.display = "none";
   
     let sponsorTimeContainer = document.getElementById("sponsorTimeContainer" + index);
   
@@ -512,8 +515,7 @@ function runThePopup() {
     let editButton = document.getElementById("sponsorTimeEditButton" + index);
     let sponsorTimesContainer = document.getElementById("sponsorTimesContainer");
   
-    editButton.remove();
-    sponsorTimesContainer.appendChild(saveButton);
+    sponsorTimesContainer.replaceChild(saveButton, editButton);
   }
   
   function saveSponsorTimeEdit(index) {
@@ -531,6 +533,8 @@ function runThePopup() {
     chrome.storage.sync.set({[sponsorTimeKey]: sponsorTimes});
   
     displaySponsorTimes();
+
+    showSubmitTimesIfNecessary();
   }
   
   //deletes the sponsor time submitted at an index