diff --git a/test/javascript/progressstatus.js b/test/javascript/progressstatus.js
index 02e9a85f..bec032ba 100644
--- a/test/javascript/progressstatus.js
+++ b/test/javascript/progressstatus.js
@@ -99,6 +99,7 @@ function HideProgressStatus(should_hide)
         if (should_hide == true)
         {
             div_progress.style.visibility = "hidden";
+            div_progress.style.zIndex = "-999";
             g_status_text.splice(0, g_status_text.length);
             g_status_timer.splice(0, g_status_timer.length);
             progress_bar.value = -1;
@@ -107,6 +108,7 @@ function HideProgressStatus(should_hide)
         else
         {
             div_progress.style.visibility = "visible";
+            div_progress.style.zIndex = "999";
             progress_bar.value = -1;
             AddTextStatus('Please wait for module loading');
             UpdateTextStatus(1.0);
diff --git a/test/meshviewer.cpp b/test/meshviewer.cpp
index b167dee6..9bb90313 100644
--- a/test/meshviewer.cpp
+++ b/test/meshviewer.cpp
@@ -26,7 +26,7 @@ static int const TEXTURE_WIDTH = 256;
 
 #define     NO_NACL_EM          (!__native_client__ && !EMSCRIPTEN)
 #define     NACL_EM             (__native_client__ || EMSCRIPTEN)
-#define     NO_NACL_EM_INPUT    (1 && NO_NACL_EM)
+#define     NO_NACL_EM_INPUT    (1 && !EMSCRIPTEN)
 
 #define     R_M                 1.f
 #if NACL_EM
diff --git a/test/meshviewer.index.html b/test/meshviewer.index.html
index 7f9e2c12..b6bb5a4d 100644
--- a/test/meshviewer.index.html
+++ b/test/meshviewer.index.html
@@ -37,6 +37,7 @@ textarea
     background-color:white;
     border:1px solid #000000;
     visibility: hidden;
+    z-index: 1;
 }
 progress
 {
@@ -70,7 +71,7 @@ progress::-webkit-progress-value
     position: absolute;
     top: 2px;
     left: 2px;
-    z-index: -1;
+    z-index: 0;
 }
 #BGCanvas
 {