diff --git a/lib/assets/javascripts/views/plans/new.js b/lib/assets/javascripts/views/plans/new.js
index 1bf3ac0..5e562e4 100644
--- a/lib/assets/javascripts/views/plans/new.js
+++ b/lib/assets/javascripts/views/plans/new.js
@@ -52,8 +52,7 @@
         } else {
           $('#multiple-templates').show();
           $('#available-templates').fadeIn();
-          $('#single-template').hide();
-          $('#default-template').hide();
+          $('#single-template, #default-template').hide();
         }
         toggleSubmit();
       } else {
@@ -163,11 +162,15 @@
   });
 
   // Empty combobox on second tab activation
-  $('a[href="#other_org"]').on('shown.bs.tab', () => {
+  const emptySecondTab = () => {
     $('#plan_org_id').val('-1');
     $('#plan_org_name').val('');
     $('#single-template, #default-template').hide();
-  });
+  };
+
+  // Empty combobox on second tab activation
+  $('a[href="#other_org"]').on('shown.bs.tab', emptySecondTab);
+  $('a[href="#other_org"]').on('hidden.bs.tab', emptySecondTab);
 
   // Restore default organisation when activating first tab
   $('a[href="#own_org"]').on('shown.bs.tab', () => {