diff --git a/apps/remix-ide/src/app/files/file-explorer.js b/apps/remix-ide/src/app/files/file-explorer.js
index 9f5f3e3f69..cc9986aebf 100644
--- a/apps/remix-ide/src/app/files/file-explorer.js
+++ b/apps/remix-ide/src/app/files/file-explorer.js
@@ -9,7 +9,7 @@ const helper = require('../../lib/helper')
 const yo = require('yo-yo')
 const Treeview = require('../ui/TreeView')
 const modalDialog = require('../ui/modaldialog')
-const EventManager = require('../../lib/events')
+const EventManager = require('events')
 const contextMenu = require('../ui/contextMenu')
 const css = require('./styles/file-explorer-styles')
 const globalRegistry = require('../../global/registry')
diff --git a/apps/remix-ide/src/app/panels/file-panel.js b/apps/remix-ide/src/app/panels/file-panel.js
index 6bdef578d6..020c02a62d 100644
--- a/apps/remix-ide/src/app/panels/file-panel.js
+++ b/apps/remix-ide/src/app/panels/file-panel.js
@@ -6,14 +6,13 @@ import ReactDOM from 'react-dom'
 import { Workspace } from '@remix-ui/workspace' // eslint-disable-line
 import { bufferToHex, keccakFromString } from 'ethereumjs-util'
 import { checkSpecialChars, checkSlash } from '../../lib/helper'
-var EventManager = require('../../lib/events')
-var { RemixdHandle } = require('../files/remixd-handle.js')
-var { GitHandle } = require('../files/git-handle.js')
-var { HardhatHandle } = require('../files/hardhat-handle.js')
-var globalRegistry = require('../../global/registry')
-var examples = require('../editor/examples')
-var GistHandler = require('../../lib/gist-handler')
-var QueryParams = require('../../lib/query-params')
+const { RemixdHandle } = require('../files/remixd-handle.js')
+const { GitHandle } = require('../files/git-handle.js')
+const { HardhatHandle } = require('../files/hardhat-handle.js')
+const globalRegistry = require('../../global/registry')
+const examples = require('../editor/examples')
+const GistHandler = require('../../lib/gist-handler')
+const QueryParams = require('../../lib/query-params')
 const modalDialogCustom = require('../ui/modal-dialog-custom')
 /*
   Overview of APIs:
@@ -48,7 +47,7 @@ const profile = {
 module.exports = class Filepanel extends ViewPlugin {
   constructor (appManager) {
     super(profile)
-    this.event = new EventManager()
+    this.event = new EventEmitter()
     this._components = {}
     this._components.registry = globalRegistry
     this._deps = {