2 files changed, 9 insertions, 1 deletions
diff --git a/app/assets/javascripts/editor/editor_lite.js b/app/assets/javascripts/editor/editor_lite.js
index 79beb3a4857..249888ede9b 100644
--- a/app/assets/javascripts/editor/editor_lite.js
+++ b/app/assets/javascripts/editor/editor_lite.js
@@ -1,10 +1,10 @@
 import { editor as monacoEditor, languages as monacoLanguages, Uri } from 'monaco-editor';
-import { uuids } from '~/diffs/utils/uuids';
 import { defaultEditorOptions } from '~/ide/lib/editor_options';
 import languages from '~/ide/lib/languages';
 import { DEFAULT_THEME, themes } from '~/ide/lib/themes';
 import { registerLanguages } from '~/ide/utils';
 import { joinPaths } from '~/lib/utils/url_utility';
+import { uuids } from '~/lib/utils/uuids';
 import {
   EDITOR_LITE_INSTANCE_ERROR_NO_EL,
   URI_PREFIX,
diff --git a/app/assets/javascripts/editor/extensions/editor_lite_extension_base.js b/app/assets/javascripts/editor/extensions/editor_lite_extension_base.js
index 3d4f08131c1..05a020bd958 100644
--- a/app/assets/javascripts/editor/extensions/editor_lite_extension_base.js
+++ b/app/assets/javascripts/editor/extensions/editor_lite_extension_base.js
@@ -1,4 +1,5 @@
 import { Range } from 'monaco-editor';
+import { waitForCSSLoaded } from '~/helpers/startup_css_helper';
 import { ERROR_INSTANCE_REQUIRED_FOR_EXTENSION, EDITOR_TYPE_CODE } from '../constants';
 
 const hashRegexp = new RegExp('#?L', 'g');
@@ -23,11 +24,18 @@ export class EditorLiteExtension {
       if (instance.getEditorType && instance.getEditorType() === EDITOR_TYPE_CODE) {
         EditorLiteExtension.setupLineLinking(instance);
       }
+      EditorLiteExtension.deferRerender(instance);
     } else if (Object.entries(options).length) {
       throw new Error(ERROR_INSTANCE_REQUIRED_FOR_EXTENSION);
     }
   }
 
+  static deferRerender(instance) {
+    waitForCSSLoaded(() => {
+      instance.layout();
+    });
+  }
+
   static highlightLines(instance) {
     const { hash } = window.location;
     if (!hash) {