diff --git a/webapp/src/main/webapp/themes/iph/templates/queryBuilder.ftl b/webapp/src/main/webapp/themes/iph/templates/queryBuilder.ftl
index 21ac3c30..04075a80 100644
--- a/webapp/src/main/webapp/themes/iph/templates/queryBuilder.ftl
+++ b/webapp/src/main/webapp/themes/iph/templates/queryBuilder.ftl
@@ -90,6 +90,7 @@
     $('#btn-get-standard-searchform').on('click', function() {
       $('#querybuilder-container').hide();    
       $('#simple-search-container').show();
+      localStorage.setItem('extendedSearchOpen',false);
     });
 
 
diff --git a/webapp/src/main/webapp/themes/iph/templates/searchSelector.ftl b/webapp/src/main/webapp/themes/iph/templates/searchSelector.ftl
index 7c49e4a1..af5e89d9 100644
--- a/webapp/src/main/webapp/themes/iph/templates/searchSelector.ftl
+++ b/webapp/src/main/webapp/themes/iph/templates/searchSelector.ftl
@@ -8,8 +8,9 @@
  $('#switch-to-extended-searchform').on('click', function() {
    $('#simple-search-container').hide();   
    $('#querybuilder-container').show();   
+   localStorage.setItem('extendedSearchOpen',true);
  });
- if ( "${querytext!?html}".includes(":"") ){
+ if (localStorage.getItem('extendedSearchOpen') === true || localStorage.getItem('extendedSearchOpen') === 'true') {
    $('#simple-search-container').hide();
    $('#querybuilder-container').show();
  }