diff --git a/resources/assets/sass/_components.scss b/resources/assets/sass/_components.scss
index 051d1978a..5b72f5e1a 100644
--- a/resources/assets/sass/_components.scss
+++ b/resources/assets/sass/_components.scss
@@ -102,6 +102,10 @@
     display: flex;
     align-self: flex-start;
   }
+
+  .popup-content {
+    overflow-y: auto;
+  }
 }
 
 .corner-button {
@@ -542,6 +546,15 @@ body.flexbox-support #entity-selector-wrap .popup-body .form-group {
   }
 }
 
+@include smaller-than($m) {
+  #code-editor .lang-options {
+    max-width: 100%;
+  }
+  #code-editor .CodeMirror {
+    height: 200px;
+  }
+}
+
 .comment-box {
   border: 1px solid #DDD;
   margin-bottom: $-s;
diff --git a/resources/views/components/code-editor.blade.php b/resources/views/components/code-editor.blade.php
index 5788bd7f7..cd235f1d2 100644
--- a/resources/views/components/code-editor.blade.php
+++ b/resources/views/components/code-editor.blade.php
@@ -7,7 +7,7 @@
                 <button class="overlay-close neg corner-button button" @click="hide()">x</button>
             </div>
 
-            <div class="padded">
+            <div class="padded popup-content">
                 <div class="form-group">
                     <label for="code-editor-language">{{ trans('components.code_language') }}</label>
                     <div class="lang-options">