diff --git a/gulpfile.js b/gulpfile.js
index f65391b59ee6..23397439b2e4 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -544,7 +544,7 @@ const buildSVGIcons = () => {
 }
 
 const copyBlocklyMedia = () =>
-    gulp.src("node_modules/blockly/media/*")
+    gulp.src("node_modules/blockly/media/*", { encoding: false })
     .pipe(gulp.dest("webapp/public/blockly/media"))
 
 
diff --git a/theme/fieldeditors.less b/theme/fieldeditors.less
index 01b2cce4a87d..77e1af4a9aaa 100644
--- a/theme/fieldeditors.less
+++ b/theme/fieldeditors.less
@@ -11,6 +11,10 @@
 @blocklyDarkTextColor: #575E75;
 @fieldNoteSelectedColor: yellowgreen;
 
+.blocklyDropDownContent {
+    overflow-y: auto;
+}
+
 ////// Note Editor Field ////////
 .blocklyDropDownContent {
     .blocklyPianoDiv {