diff --git a/gui/obmc_gui/lib/resource.robot b/gui/obmc_gui/lib/resource.robot
index 49e34c9..e4ebc3c 100644
--- a/gui/obmc_gui/lib/resource.robot
+++ b/gui/obmc_gui/lib/resource.robot
@@ -79,6 +79,7 @@
     # password      The password.
 
     Go To  ${obmc_gui_url}
+    Wait Until Element Is Enabled  ${xpath_textbox_hostname}
     Input Text  ${xpath_textbox_hostname}  ${OPENBMC_HOST}
     Input Text  ${xpath_textbox_username}  ${username}
     Input Password  ${xpath_textbox_password}  ${password}
diff --git a/gui/obmc_gui/test/gui_header/test_obmc_gui_ip_check.robot b/gui/obmc_gui/test/gui_header/test_obmc_gui_ip_check.robot
index 4a2a119..05ca46a 100644
--- a/gui/obmc_gui/test/gui_header/test_obmc_gui_ip_check.robot
+++ b/gui/obmc_gui/test/gui_header/test_obmc_gui_ip_check.robot
@@ -4,7 +4,7 @@
 
 Resource        ../../lib/resource.robot
 
-Suite Setup     Login OpenBMC GUI
+Suite Setup     Suite Setup Execution
 Suite Teardown  Close Browser
 
 *** Variables ***
@@ -23,9 +23,9 @@
 
 *** Keywords ***
 
-Login OpenBMC GUI
+Suite Setup Execution
 
-    Open Browser With URL  ${xpath_openbmc_url}
+    Open Browser With URL  ${obmc_gui_url}
     Login OpenBMC GUI  ${OPENBMC_USERNAME}  ${OPENBMC_PASSWORD}