diff --git a/js/src/console.js b/js/src/console.js
index a132c334da..2e5b944d0c 100644
--- a/js/src/console.js
+++ b/js/src/console.js
@@ -4,3 +4,5 @@ import { Console } from './modules/console.js';
 $(function () {
     Console.initialize();
 });
+
+export { Console };
diff --git a/js/src/modules/console.js b/js/src/modules/console.js
index 0f7b7351d7..f1221b0e41 100644
--- a/js/src/modules/console.js
+++ b/js/src/modules/console.js
@@ -1495,6 +1495,4 @@ var ConsoleDebug = {
     }
 };
 
-window.Console = Console;
-
 export { Console };
diff --git a/webpack.config.js b/webpack.config.js
index 4a170b2ee3..387013af6f 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -16,7 +16,7 @@ module.exports = [
             'codemirror/addon/lint/sql-lint': './js/src/codemirror/addon/lint/sql-lint.js',
             'common': './js/src/common.js',
             'config': './js/src/config.js',
-            'console': './js/src/console.js',
+            'console': { import: './js/src/console.js', library: { name: 'Console', type: 'window', export: 'Console' } },
             'cross_framing_protection': './js/src/cross_framing_protection.js',
             'datetimepicker': './js/src/datetimepicker.js',
             'database/central_columns': './js/src/database/central_columns.js',