diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/BlockTerminalView.kt b/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/BlockTerminalView.kt
index d62f471c96b6..ff0db8ae7e14 100644
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/BlockTerminalView.kt
+++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/BlockTerminalView.kt
@@ -132,8 +132,7 @@ class BlockTerminalView(
   }
 
   private fun installAlternateBufferPanel() {
-    val eventsHandler = SimpleTerminalEventsHandler(session, settings)
-    val view = SimpleTerminalView(project, settings, session, eventsHandler, withVerticalScroll = false)
+    val view = SimpleTerminalView(project, settings, session, withVerticalScroll = false)
     Disposer.register(this, view)
     alternateBufferView = view
 
diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/PlainTerminalView.kt b/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/PlainTerminalView.kt
index 8d6285f037db..f74389660cea 100644
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/PlainTerminalView.kt
+++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/PlainTerminalView.kt
@@ -30,8 +30,7 @@ class PlainTerminalView(
   private val view: SimpleTerminalView
 
   init {
-    val eventsHandler = SimpleTerminalEventsHandler(session, settings)
-    view = SimpleTerminalView(project, settings, session, eventsHandler)
+    view = SimpleTerminalView(project, settings, session)
     view.component.addComponentListener(object : ComponentAdapter() {
       override fun componentResized(e: ComponentEvent?) {
         val newSize = getTerminalSize() ?: return
diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/SimpleTerminalController.kt b/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/SimpleTerminalController.kt
index dcebb42c3595..d139b85d436f 100644
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/SimpleTerminalController.kt
+++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/SimpleTerminalController.kt
@@ -20,8 +20,7 @@ import org.jetbrains.plugins.terminal.exp.TerminalUiUtils.toTextAttributes
 class SimpleTerminalController(
   settings: JBTerminalSystemSettingsProviderBase,
   private val session: TerminalSession,
-  private val editor: EditorEx,
-  eventsHandler: TerminalEventsHandler
+  private val editor: EditorEx
 ) : Disposable {
   val document: Document
     get() = editor.document
@@ -43,6 +42,7 @@ class SimpleTerminalController(
     terminalModel.isCommandRunning = true
 
     setupContentListener()
+    val eventsHandler = SimpleTerminalEventsHandler(session, settings)
     setupKeyEventDispatcher(editor, settings, eventsHandler, outputModel, selectionModel, disposable = this)
     setupMouseListener(editor, settings, terminalModel, eventsHandler, disposable = this)
     terminalModel.withContentLock {
diff --git a/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/SimpleTerminalView.kt b/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/SimpleTerminalView.kt
index 9357df71c4b9..29a1dcda7159 100644
--- a/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/SimpleTerminalView.kt
+++ b/plugins/terminal/src/org/jetbrains/plugins/terminal/exp/SimpleTerminalView.kt
@@ -25,7 +25,6 @@ class SimpleTerminalView(
   private val project: Project,
   private val settings: JBTerminalSystemSettingsProviderBase,
   session: TerminalSession,
-  eventsHandler: TerminalEventsHandler,
   private val withVerticalScroll: Boolean = true
 ) : Disposable {
   private val editor: EditorImpl
@@ -48,7 +47,7 @@ class SimpleTerminalView(
   init {
     val palette = session.colorPalette
     editor = createEditor(palette)
-    controller = SimpleTerminalController(settings, session, editor, eventsHandler)
+    controller = SimpleTerminalController(settings, session, editor)
     component = SimpleTerminalPanel(palette)
     editor.addFocusListener(object : FocusChangeListener {
       override fun focusGained(editor: Editor) {