diff --git a/extensions/b2g/viewer.html b/extensions/b2g/viewer.html
index 3724b4e24..cb0f3d3da 100644
--- a/extensions/b2g/viewer.html
+++ b/extensions/b2g/viewer.html
@@ -27,11 +27,6 @@ limitations under the License.
     <script type="text/javascript" src="l10n.js"></script>
     <script type="text/javascript" src="../build/pdf.js"></script>
     <script type="text/javascript" src="/shared/js/async_storage.js"></script>
-    <script type="text/javascript">
-      // This specifies the location of the pdf.js file.
-      PDFJS.workerSrc = "../build/pdf.js";
-      PDFJS.disableTextLayer = true;
-    </script>
 
     <script type="text/javascript" src="viewer.js"></script>
   </head>
@@ -67,15 +62,15 @@ limitations under the License.
     <div id="errorWrapper" hidden='true'>
       <div id="errorMessageLeft">
         <span id="errorMessage"></span>
-        <button id="errorShowMore" onclick="" oncontextmenu="return false;" data-l10n-id="error_more_info">
+        <button id="errorShowMore" data-l10n-id="error_more_info">
           More Information
         </button>
-        <button id="errorShowLess" onclick="" oncontextmenu="return false;" data-l10n-id="error_less_info" hidden='true'>
+        <button id="errorShowLess" data-l10n-id="error_less_info" hidden='true'>
           Less Information
         </button>
       </div>
       <div id="errorMessageRight">
-        <button id="errorClose" oncontextmenu="return false;" data-l10n-id="error_close">
+        <button id="errorClose" data-l10n-id="error_close">
           Close
         </button>
       </div>
diff --git a/web/viewer.js b/web/viewer.js
index 211ae6bab..a7b4d259b 100644
--- a/web/viewer.js
+++ b/web/viewer.js
@@ -43,6 +43,7 @@ var CLEANUP_TIMEOUT = 30000;
 var IGNORE_CURRENT_POSITION_ON_ZOOM = false;
 //#if B2G
 //USE_ONLY_CSS_ZOOM = true;
+//PDFJS.disableTextLayer = true;
 //#endif
 var RenderingStates = {
   INITIAL: 0,