diff --git a/resources/js/services/code.js b/resources/js/services/code.js
index 70355643d..f69f28b8e 100644
--- a/resources/js/services/code.js
+++ b/resources/js/services/code.js
@@ -29,6 +29,8 @@ import 'codemirror/mode/yaml/yaml';
 // Addons
 import 'codemirror/addon/scroll/scrollpastend';
 
+// Mapping of potential languages or formats from user input
+// to their proper codemirror modes.
 const modeMap = {
     css: 'css',
     c: 'text/x-csrc',
@@ -43,7 +45,7 @@ const modeMap = {
     haskell: 'haskell',
     hs: 'haskell',
     html: 'htmlmixed',
-    ini: 'ini',
+    ini: 'properties',
     javascript: 'javascript',
     json: {name: 'javascript', json: true},
     js: 'javascript',
diff --git a/resources/sass/_components.scss b/resources/sass/_components.scss
index 0172956a7..2085e06ea 100644
--- a/resources/sass/_components.scss
+++ b/resources/sass/_components.scss
@@ -602,7 +602,7 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
 }
 
 #code-editor .lang-options {
-  max-width: 400px;
+  max-width: 480px;
   margin-bottom: $-s;
   a {
     margin-right: $-xs;
diff --git a/resources/views/components/code-editor.blade.php b/resources/views/components/code-editor.blade.php
index 863cdfd85..f8377b120 100644
--- a/resources/views/components/code-editor.blade.php
+++ b/resources/views/components/code-editor.blade.php
@@ -18,13 +18,13 @@
                             <a @click="updateLanguage('C#')">C#</a>
                             <a @click="updateLanguage('Go')">Go</a>
                             <a @click="updateLanguage('HTML')">HTML</a>
+                            <a @click="updateLanguage('INI')">INI</a>
                             <a @click="updateLanguage('Java')">Java</a>
                             <a @click="updateLanguage('JavaScript')">JavaScript</a>
                             <a @click="updateLanguage('JSON')">JSON</a>
                             <a @click="updateLanguage('Lua')">Lua</a>
                             <a @click="updateLanguage('PHP')">PHP</a>
                             <a @click="updateLanguage('Powershell')">Powershell</a>
-                            <a @click="updateLanguage('Properties')">Properties</a>
                             <a @click="updateLanguage('MarkDown')">MarkDown</a>
                             <a @click="updateLanguage('Nginx')">Nginx</a>
                             <a @click="updateLanguage('Python')">Python</a>