diff --git a/resources/js/code/languages.js b/resources/js/code/languages.js
index da9631a13..52fc55dbf 100644
--- a/resources/js/code/languages.js
+++ b/resources/js/code/languages.js
@@ -33,6 +33,7 @@ const modeMap = {
     'f#': () => legacyLoad('fSharp'),
     fsharp: () => legacyLoad('fSharp'),
     go: () => legacyLoad('go'),
+    groovy: () => legacyLoad('groovy'),
     haskell: () => legacyLoad('haskell'),
     hs: () => legacyLoad('haskell'),
     html: async () => html({selfClosingTags: true}),
diff --git a/resources/js/code/legacy-modes.mjs b/resources/js/code/legacy-modes.mjs
index 7b70bec10..a5878ccab 100644
--- a/resources/js/code/legacy-modes.mjs
+++ b/resources/js/code/legacy-modes.mjs
@@ -5,6 +5,8 @@ export {clojure} from '@codemirror/legacy-modes/mode/clojure';
 export {diff} from '@codemirror/legacy-modes/mode/diff';
 export {fortran} from '@codemirror/legacy-modes/mode/fortran';
 export {go} from '@codemirror/legacy-modes/mode/go';
+export {groovy} from '@codemirror/legacy-modes/mode/groovy';
+export {haxe} from '@codemirror/legacy-modes/mode/haxe';
 export {haskell} from '@codemirror/legacy-modes/mode/haskell';
 export {julia} from '@codemirror/legacy-modes/mode/julia';
 export {lua} from '@codemirror/legacy-modes/mode/lua';
diff --git a/resources/views/pages/parts/code-editor.blade.php b/resources/views/pages/parts/code-editor.blade.php
index 303b3b0be..8fa433738 100644
--- a/resources/views/pages/parts/code-editor.blade.php
+++ b/resources/views/pages/parts/code-editor.blade.php
@@ -23,7 +23,7 @@
                     <div refs="code-editor@language-options-container" class="lang-options">
                         @php
                             $languages = [
-                                'Bash', 'CSS', 'C', 'C++', 'C#', 'Clojure', 'Dart', 'Diff', 'Fortran', 'F#', 'Go', 'Haskell', 'HTML', 'INI',
+                                'Bash', 'CSS', 'C', 'C++', 'C#', 'Clojure', 'Dart', 'Diff', 'Fortran', 'F#', 'Go', 'Groovy', 'Haskell', 'HTML', 'INI',
                                 'Java', 'JavaScript', 'JSON', 'Julia', 'Kotlin', 'LaTeX', 'Lua', 'MarkDown', 'MATLAB', 'MSSQL', 'MySQL',
                                 'Nginx', 'OCaml', 'Octave', 'Pascal', 'Perl', 'PHP', 'PL/SQL', 'PostgreSQL', 'Powershell', 'Python',
                                 'R', 'Ruby', 'Rust', 'SAS', 'Scala', 'Scheme', 'Shell', 'Smarty', 'SQL', 'SQLite', 'Swift',