diff --git a/src/js/control/textarea.quill.js b/src/js/control/textarea.quill.js
index a9ac571d4..f63bd3722 100644
--- a/src/js/control/textarea.quill.js
+++ b/src/js/control/textarea.quill.js
@@ -49,6 +49,9 @@ export default class controlQuill extends controlTextarea {
     //Textareas do not have an attribute 'type'
     delete attrs['type']
     this.field = this.markup('div', null, attrs)
+    if (this.field.classList.contains('form-control')) {
+      this.field.classList.remove('form-control')
+    }
     return this.field
   }
 
diff --git a/src/js/form-builder.js b/src/js/form-builder.js
index 4494915bf..ab0a0006f 100644
--- a/src/js/form-builder.js
+++ b/src/js/form-builder.js
@@ -1667,7 +1667,7 @@ function FormBuilder(opts, element, $) {
   })
 
   $stage.on('dblclick', 'li.form-field', e => {
-    if (['select', 'input', 'label'].includes(e.target.tagName.toLowerCase()) || e.target.contentEditable === 'true') {
+    if (['select', 'input', 'label','textarea',].includes(e.target.tagName.toLowerCase()) || e.target.isContentEditable === true) {
       return
     }
     e.stopPropagation()
diff --git a/src/js/utils.js b/src/js/utils.js
index 4b77bd892..fc4cf5df8 100644
--- a/src/js/utils.js
+++ b/src/js/utils.js
@@ -663,7 +663,7 @@ export const bootstrapColumnRegex = /^col-(xs|sm|md|lg)-([^\s]+)/
  * @returns {string[]}
  */
 export const getAllGridRelatedClasses = className => {
-  return className.split(' ').filter(x => bootstrapColumnRegex.test(x) || x.startsWith('row-'))
+  return (typeof className === 'string') ? className.split(' ').filter(x => bootstrapColumnRegex.test(x) || x.startsWith('row-')) : []
 }
 
 /**