diff --git a/functions.js b/functions.js
index 09daebdea77ecd8a6f9065d854bdd3ee0edf31f3..a8ba502838ce866f85ed8901f3c2ca45e06eca1e 100644
--- a/functions.js
+++ b/functions.js
@@ -147,9 +147,6 @@ function showError($sMessage){
  */
 async function checkSession() {
     const url = "/Shibboleth.sso/Session";
-    if(!bShowLoginOnError) {
-        document.getElementById('shib-select-idp').style.display = 'none';
-    }
     try {
         const response = await fetch(url);
         if (!response.ok) {
@@ -159,6 +156,8 @@ async function checkSession() {
             );
             if(bShowLoginOnError) {
                 showFilterBox();
+            } else {
+                document.getElementById('shib-select-idp').style.display = 'none';
             }
             throw new Error(`Response status: ${response.status}`);
         }
@@ -171,6 +170,9 @@ async function checkSession() {
         } else {
             // console.log("Logged in already");
             document.getElementById('shib-check-logged-in').style.display = 'block';
+            if(!bShowLoginOnError) {
+                document.getElementById('shib-select-idp').style.display = 'none';
+            }
         }
 
         // ...