diff --git a/app/assets/javascripts/pages/projects/environments/terminal/index.js b/app/assets/javascripts/pages/projects/environments/terminal/index.js
new file mode 100644
index 0000000000000000000000000000000000000000..7129e24cee10f35cd0d485cd7bb94c48fc51b40c
--- /dev/null
+++ b/app/assets/javascripts/pages/projects/environments/terminal/index.js
@@ -0,0 +1,3 @@
+import initTerminal from '~/terminal/';
+
+document.addEventListener('DOMContentLoaded', initTerminal);
diff --git a/app/assets/javascripts/terminal/terminal_bundle.js b/app/assets/javascripts/terminal/index.js
similarity index 74%
rename from app/assets/javascripts/terminal/terminal_bundle.js
rename to app/assets/javascripts/terminal/index.js
index 134522ef96107b326e56bc9002ef2040cb2bea97..1a75e072c4e657254790bc17dd65620e2bf3953f 100644
--- a/app/assets/javascripts/terminal/terminal_bundle.js
+++ b/app/assets/javascripts/terminal/index.js
@@ -6,4 +6,4 @@ import './terminal';
 
 window.Terminal = Terminal;
 
-$(() => new gl.Terminal({ selector: '#terminal' }));
+export default () => new gl.Terminal({ selector: '#terminal' });
diff --git a/app/views/projects/environments/terminal.html.haml b/app/views/projects/environments/terminal.html.haml
index 7be4ef39117b030af5e2f76733c6dc7063b43016..6ec4ff5655250db5a6f11a2791548a7777eb7bf1 100644
--- a/app/views/projects/environments/terminal.html.haml
+++ b/app/views/projects/environments/terminal.html.haml
@@ -3,7 +3,6 @@
 
 - content_for :page_specific_javascripts do
   = stylesheet_link_tag "xterm/xterm"
-  = webpack_bundle_tag("terminal")
 
 %div{ class: container_class }
   .top-area
diff --git a/config/webpack.config.js b/config/webpack.config.js
index 959cebe74874d4fb614c0fe66eb9ef4b878173fe..0fedb6a8c72fd2d2d3ef01c7d2505bf8c99edb19 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -45,7 +45,6 @@ function generateEntries() {
   const manualEntries = {
     monitoring:           './monitoring/monitoring_bundle.js',
     mr_notes:             './mr_notes/index.js',
-    terminal:             './terminal/terminal_bundle.js',
 
     common:               './commons/index.js',
     common_vue:           './vue_shared/vue_resource_interceptor.js',