diff --git a/l10n/en-US/viewer.properties b/l10n/en-US/viewer.properties
index de6fd95db..ce268a113 100644
--- a/l10n/en-US/viewer.properties
+++ b/l10n/en-US/viewer.properties
@@ -87,3 +87,5 @@ loading_error=An error occurred while loading the PDF.
 # Some common types are e.g.: "Check", "Text", "Comment", "Note"
 text_annotation_type=[{{type}} Annotation]
 request_password=PDF is protected by a password:
+
+printing_not_supported=Warning: Printing is not supported by this browser.
diff --git a/web/viewer.html b/web/viewer.html
index 5d66e8b33..28e57f700 100644
--- a/web/viewer.html
+++ b/web/viewer.html
@@ -102,11 +102,9 @@
                    <span data-l10n-id="open_file_label">Open</span>
                 </button>
 
-                <!--
                 <button id="print" class="toolbarButton print" title="Print" tabindex="11" data-l10n-id="print" onclick="window.print()">
                   <span data-l10n-id="print_label">Print</span>
                 </button>
-                -->
 
                 <button id="download" class="toolbarButton download" title="Download" onclick="PDFView.download();" tabindex="12" data-l10n-id="download">
                   <span data-l10n-id="download_label">Download</span>
diff --git a/web/viewer.js b/web/viewer.js
index 1a7732e4e..377a4fc7e 100644
--- a/web/viewer.js
+++ b/web/viewer.js
@@ -1050,7 +1050,9 @@ var PDFView = {
 
   beforePrint: function pdfViewSetupBeforePrint() {
     if (!this.supportsPrinting) {
-      alert('Printing is not supported by this browser.');
+      var printMessage = mozL10n.get('printing_not_supported', null,
+                         'Warning: Printing is not supported by this browser.');
+      alert(printMessage);
       return;
     }
     for (var i = 0, ii = this.pages.length; i < ii; ++i) {
@@ -1761,6 +1763,10 @@ window.addEventListener('load', function webViewerLoad(evt) {
     document.querySelector('#viewSearch').classList.remove('hidden');
   }
 
+  if (!PDFView.supportsPrinting) {
+    document.getElementById('print').classList.add('hidden');
+  }
+
   // Listen for warnings to trigger the fallback UI.  Errors should be caught
   // and call PDFView.error() so we don't need to listen for those.
   PDFJS.LogManager.addLogger({