3 files changed, 22 insertions, 10 deletions
diff --git a/src/pages/popup/popup.html b/src/pages/popup/popup.html
index db7148c9..48f6f116 100644
--- a/src/pages/popup/popup.html
+++ b/src/pages/popup/popup.html
@@ -84,7 +84,7 @@
         <h4>Send Files</h4></a>
       <input id="disable-sendTargets" type="checkbox">
     </div>
-    <div class="some-block"><a class="title button" id="change_instance">
+    <div class="some-block" id="change_instance_div"><a class="title button" id="change_instance">
         <svg xmlns="http://www.w3.org/2000/svg" height="26px" viewBox="0 0 24 24" width="26px" fill="currentColor">
           <path d="M12 4V1L8 5l4 4V6c3.31 0 6 2.69 6 6 0 1.01-.25 1.97-.7 2.8l1.46 1.46C19.54 15.03 20 13.57 20 12c0-4.42-3.58-8-8-8zm0 14c-3.31 0-6-2.69-6-6 0-1.01.25-1.97.7-2.8L5.24 7.74C4.46 8.97 4 10.43 4 12c0 4.42 3.58 8 8 8v3l4-4-4-4v3z"></path>
         </svg>
diff --git a/src/pages/popup/popup.js b/src/pages/popup/popup.js
index dc6c373f..b9c75791 100644
--- a/src/pages/popup/popup.js
+++ b/src/pages/popup/popup.js
@@ -77,17 +77,29 @@ document.addEventListener("change", () => {
   });
 })
 
-document.getElementById("change_instance").addEventListener("click", utils.switchInstance);
-let copyRawElement = document.getElementById('copy_raw');
-copyRawElement.addEventListener("click", () => utils.copyRaw(false, copyRawElement));
+utils.switchInstance(true).then(r => {
+  if (!r) document.getElementById("change_instance_div").style.display = 'none';
+  else document.getElementById("change_instance").addEventListener("click", () => utils.switchInstance(false));
+});
 
-utils.copyRaw(true).then(r => { if (!r) document.getElementById('copy_raw_div').style.display = 'none'; })
-// utils.unify().then(r => { if (!r) document.getElementById('unify_div').style.display = 'none'; })
+utils.copyRaw(true).then(r => {
+  if (!r) document.getElementById('copy_raw_div').style.display = 'none';
+  else {
+    const copy_raw = document.getElementById('copy_raw');
+    copy_raw.addEventListener("click", () => utils.copyRaw(false, copy_raw));
+  }
+})
+
+utils.unify(true).then(r => {
+  if (!r) document.getElementById('unify_div').style.display = 'none';
+  else {
+    const unify = document.getElementById('unify');
+    unify.addEventListener("click", () => utils.unify(false, unify));
+  }
+})
 
-document.getElementById("more-options").addEventListener("click", () => browser.runtime.openOptionsPage());
 
-let unifyElement = document.getElementById('unify');
-unifyElement.addEventListener("click", () => utils.unify(unifyElement));
+document.getElementById("more-options").addEventListener("click", () => browser.runtime.openOptionsPage());
 
 generalHelper.init().then(() => {
   let popupFrontends = generalHelper.getPopupFrontends();
diff --git a/src/pages/popup/popup.pug b/src/pages/popup/popup.pug
index 12588679..35234b15 100644
--- a/src/pages/popup/popup.pug
+++ b/src/pages/popup/popup.pug
@@ -98,7 +98,7 @@ html(lang="en")
                 h4 Send Files
             input#disable-sendTargets(type="checkbox")
 
-        .some-block
+        #change_instance_div.some-block
             a#change_instance.title.button
                 +change_instance
                 h4 Change Instance