diff --git a/gui/gui_test/gui_header/test_gui_header.robot b/gui/gui_test/gui_header/test_gui_header.robot
index d4b9f83..9aedb63 100644
--- a/gui/gui_test/gui_header/test_gui_header.robot
+++ b/gui/gui_test/gui_header/test_gui_header.robot
@@ -48,3 +48,4 @@
     Click Element  ${xpath_root_button_menu}
     Click Element  ${xpath_logout_button}
     Wait Until Page Contains Element  ${xpath_login_button}  timeout=15s
+    Wait Until Element Is Not Visible   ${xpath_page_loading_progress_bar}  timeout=30
diff --git a/gui/gui_test/gui_header/test_profile_settings_sub_menu.robot b/gui/gui_test/gui_header/test_profile_settings_sub_menu.robot
index fb0b94f..a274e93 100644
--- a/gui/gui_test/gui_header/test_profile_settings_sub_menu.robot
+++ b/gui/gui_test/gui_header/test_profile_settings_sub_menu.robot
@@ -88,3 +88,4 @@
     Wait Until Page Contains Element  ${xpath_profile_settings}
     Click Element  ${xpath_profile_settings}
     Wait Until Keyword Succeeds  30 sec  10 sec  Location Should Contain  profile-settings
+    Wait Until Element Is Not Visible   ${xpath_page_loading_progress_bar}  timeout=30
diff --git a/gui/gui_test/logs_menu/test_dumps_sub_menu.robot b/gui/gui_test/logs_menu/test_dumps_sub_menu.robot
index de9bed5..f67faf8 100644
--- a/gui/gui_test/logs_menu/test_dumps_sub_menu.robot
+++ b/gui/gui_test/logs_menu/test_dumps_sub_menu.robot
@@ -60,3 +60,4 @@
     Click Element  ${xpath_logs_menu}
     Click Element  ${xpath_dumps_sub_menu}
     Wait Until Keyword Succeeds  30 sec  5 sec  Location Should Contain  dumps
+    Wait Until Element Is Not Visible   ${xpath_page_loading_progress_bar}  timeout=30
diff --git a/gui/gui_test/logs_menu/test_progress_logs_sub_menu.robot b/gui/gui_test/logs_menu/test_progress_logs_sub_menu.robot
index 9b1947d..ee05ff9 100644
--- a/gui/gui_test/logs_menu/test_progress_logs_sub_menu.robot
+++ b/gui/gui_test/logs_menu/test_progress_logs_sub_menu.robot
@@ -66,3 +66,4 @@
     Click Element  ${xpath_logs_menu}
     Click Element  ${xpath_progress_logs_sub_menu}
     Wait Until Keyword Succeeds  30 sec  5 sec  Location Should Contain  post-code-logs
+    Wait Until Element Is Not Visible   ${xpath_page_loading_progress_bar}  timeout=30
diff --git a/gui/gui_test/operations_menu/test_firmware_sub_menu.robot b/gui/gui_test/operations_menu/test_firmware_sub_menu.robot
index 9f0da11..208d662 100644
--- a/gui/gui_test/operations_menu/test_firmware_sub_menu.robot
+++ b/gui/gui_test/operations_menu/test_firmware_sub_menu.robot
@@ -71,3 +71,4 @@
     Click Element  ${xpath_operations_menu}
     Click Element  ${xpath_firmware_update_sub_menu}
     Wait Until Keyword Succeeds  30 sec  10 sec  Location Should Contain  firmware
+    Wait Until Element Is Not Visible   ${xpath_page_loading_progress_bar}  timeout=30
diff --git a/gui/gui_test/operations_menu/test_server_power_operations_sub_menu.robot b/gui/gui_test/operations_menu/test_server_power_operations_sub_menu.robot
index 03866d0..f84929f 100644
--- a/gui/gui_test/operations_menu/test_server_power_operations_sub_menu.robot
+++ b/gui/gui_test/operations_menu/test_server_power_operations_sub_menu.robot
@@ -158,3 +158,4 @@
     Click Element  ${xpath_operations_menu}
     Click Element  ${xpath_server_power_operations_sub_menu}
     Wait Until Keyword Succeeds  30 sec  10 sec  Location Should Contain  server-power-operations
+    Wait Until Element Is Not Visible   ${xpath_page_loading_progress_bar}  timeout=30
diff --git a/gui/gui_test/security_and_access_menu/test_certificates_sub_menu.robot b/gui/gui_test/security_and_access_menu/test_certificates_sub_menu.robot
index e39ca18..3a56a4b 100644
--- a/gui/gui_test/security_and_access_menu/test_certificates_sub_menu.robot
+++ b/gui/gui_test/security_and_access_menu/test_certificates_sub_menu.robot
@@ -146,6 +146,7 @@
     Click Element  ${xpath_secuity_and_accesss_menu}
     Click Element  ${xpath_certificates_sub_menu}
     Wait Until Keyword Succeeds  30 sec  10 sec  Location Should Contain  certificates
+    Wait Until Element Is Not Visible   ${xpath_page_loading_progress_bar}  timeout=30
 
 
 Suite Setup Execution
diff --git a/gui/gui_test/security_and_access_menu/test_ldap_sub_menu.robot b/gui/gui_test/security_and_access_menu/test_ldap_sub_menu.robot
index e77f303..e413b56 100644
--- a/gui/gui_test/security_and_access_menu/test_ldap_sub_menu.robot
+++ b/gui/gui_test/security_and_access_menu/test_ldap_sub_menu.robot
@@ -194,6 +194,7 @@
     Click Element  ${xpath_secuity_and_accesss_menu}
     Click Element  ${xpath_ldap_sub_menu}
     Wait Until Keyword Succeeds  30 sec  10 sec  Location Should Contain  ldap
+    Wait Until Element Is Not Visible   ${xpath_page_loading_progress_bar}  timeout=30
     Wait Until Element Is Enabled  ${xpath_enable_ldap_checkbox}  timeout=10s
 
     Valid Value  LDAP_TYPE  valid_values=["ActiveDirectory", "LDAP"]
diff --git a/gui/gui_test/security_and_access_menu/test_multiple_interfaces.robot b/gui/gui_test/security_and_access_menu/test_multiple_interfaces.robot
index fa48614..b579d81 100644
--- a/gui/gui_test/security_and_access_menu/test_multiple_interfaces.robot
+++ b/gui/gui_test/security_and_access_menu/test_multiple_interfaces.robot
@@ -108,4 +108,4 @@
     Click Element  ${xpath_secuity_and_accesss_menu}
     Click Element  ${xpath_certificates_sub_menu}
     Wait Until Keyword Succeeds  30 sec  10 sec  Location Should Contain  certificates
-
+    Wait Until Element Is Not Visible   ${xpath_page_loading_progress_bar}  timeout=30
diff --git a/gui/gui_test/security_and_access_menu/test_policies_sub_menu.robot b/gui/gui_test/security_and_access_menu/test_policies_sub_menu.robot
index 0e0e921..fbf6e38 100644
--- a/gui/gui_test/security_and_access_menu/test_policies_sub_menu.robot
+++ b/gui/gui_test/security_and_access_menu/test_policies_sub_menu.robot
@@ -12,6 +12,8 @@
 
 
 *** Variables ***
+
+
 ${xpath_policies_heading}                     //h1[text()="Policies"]
 ${xpath_bmc_ssh_toggle}                       //*[@data-test-id='policies-toggle-bmcShell']
 ...  /following-sibling::label
@@ -24,6 +26,7 @@
 ${xpath_secure_version_lockin_toggle}         //*[@data-test-id='policies-toggle-svle']
 ${xpath_host_usb_enablement_toggle}           //*[@data-test-id='policies-toggle-hostUsb']
 
+
 *** Test Cases ***
 
 Verify Navigation To Policies Page
@@ -207,7 +210,7 @@
     Wait Until Keyword Succeeds  30 sec  15 sec  Click Element  ${xpath_secuity_and_accesss_menu}
     Click Element  ${xpath_policies_sub_menu}
     Wait Until Keyword Succeeds  30 sec  15 sec  Location Should Contain  policies
-
+    Wait Until Element Is Not Visible   ${xpath_page_loading_progress_bar}  timeout=30
 
 Set Policy Via GUI
 
diff --git a/gui/gui_test/security_and_access_menu/test_sessions_sub_menu.robot b/gui/gui_test/security_and_access_menu/test_sessions_sub_menu.robot
index 361789d..a054bb5 100644
--- a/gui/gui_test/security_and_access_menu/test_sessions_sub_menu.robot
+++ b/gui/gui_test/security_and_access_menu/test_sessions_sub_menu.robot
@@ -31,3 +31,4 @@
     Click Element  ${xpath_secuity_and_accesss_menu}
     Click Element  ${xpath_sessions_sub_menu}
     Wait Until Keyword Succeeds  30 sec  5 sec  Location Should Contain  sessions
+    Wait Until Element Is Not Visible   ${xpath_page_loading_progress_bar}  timeout=30
diff --git a/gui/gui_test/security_and_access_menu/test_user_management_sub_menu.robot b/gui/gui_test/security_and_access_menu/test_user_management_sub_menu.robot
index e631eb4..c1261aa 100644
--- a/gui/gui_test/security_and_access_menu/test_user_management_sub_menu.robot
+++ b/gui/gui_test/security_and_access_menu/test_user_management_sub_menu.robot
@@ -10,6 +10,8 @@
 
 
 *** Variables ***
+
+
 ${xpath_user_management_heading}         //h1[text()="User management"]
 ${xpath_select_user}                     //input[contains(@class,"custom-control-input")]
 ${xpath_account_policy}                  //button[contains(text(),'Account policy settings')]
@@ -31,6 +33,7 @@
 ${xpath_max_failed_login}                //*[@data-test-id='userManagement-input-lockoutThreshold']
 ${test_user_password}                    TestPwd1
 
+
 *** Test Cases ***
 
 Verify Navigation To User Management Page
@@ -188,4 +191,5 @@
 
     Click Element  ${xpath_secuity_and_accesss_menu}
     Click Element  ${xpath_user_management_sub_menu}
-    Wait Until Keyword Succeeds  30 sec  10 sec  Location Should Contain  user-managemen
+    Wait Until Keyword Succeeds  30 sec  10 sec  Location Should Contain  user-management
+    Wait Until Element Is Not Visible   ${xpath_page_loading_progress_bar}  timeout=30
diff --git a/gui/gui_test/settings_menu/test_network_sub_menu.robot b/gui/gui_test/settings_menu/test_network_sub_menu.robot
index 9818eb1..546b33c 100644
--- a/gui/gui_test/settings_menu/test_network_sub_menu.robot
+++ b/gui/gui_test/settings_menu/test_network_sub_menu.robot
@@ -199,6 +199,7 @@
     ...  Click Element  ${xpath_settings_menu}
     Click Element  ${xpath_network_sub_menu}
     Wait Until Keyword Succeeds  30 sec  10 sec  Location Should Contain  network
+    Wait Until Element Is Not Visible   ${xpath_page_loading_progress_bar}  timeout=30
     ${default_gateway}=  Get BMC Default Gateway
     Set Suite Variable  ${default_gateway}
 
diff --git a/gui/gui_test/settings_menu/test_snmp_alerts_sub_menu.robot b/gui/gui_test/settings_menu/test_snmp_alerts_sub_menu.robot
index 2bbfd10..52ba780 100644
--- a/gui/gui_test/settings_menu/test_snmp_alerts_sub_menu.robot
+++ b/gui/gui_test/settings_menu/test_snmp_alerts_sub_menu.robot
@@ -205,7 +205,7 @@
     Click Element  ${xpath_settings_menu}
     Click Element  ${xpath_snmp_alerts_sub_menu}
     Wait Until Keyword Succeeds  30 sec  10 sec  Location Should Contain  snmp-alerts
-
+    Wait Until Element Is Not Visible   ${xpath_page_loading_progress_bar}  timeout=30
 
 Configure SNMP Manager Via GUI
     [Documentation]  Configure SNMP manager via GUI.