diff --git a/packages/form-js-editor/src/render/components/editor-form-fields/EditorJSFunctionField.js b/packages/form-js-editor/src/render/components/editor-form-fields/EditorJSFunctionField.js
index ee45e0834..faa2065fc 100644
--- a/packages/form-js-editor/src/render/components/editor-form-fields/EditorJSFunctionField.js
+++ b/packages/form-js-editor/src/render/components/editor-form-fields/EditorJSFunctionField.js
@@ -5,14 +5,14 @@ const type = 'script';
 
 export function EditorJSFunctionField(props) {
   const { field } = props;
-  const { jsFunction = '' } = field;
+  const { jsFunction = '', key } = field;
 
   const Icon = iconsByType(type);
 
   let placeholderContent = 'JS function is empty';
 
   if (jsFunction.trim()) {
-    placeholderContent = 'JS function';
+    placeholderContent = `JS function for '${key}'`;
   }
 
   return (
diff --git a/packages/form-js-viewer/src/render/components/form-fields/JSFunctionField.js b/packages/form-js-viewer/src/render/components/form-fields/JSFunctionField.js
index 3810620ef..b8e6e5547 100644
--- a/packages/form-js-viewer/src/render/components/form-fields/JSFunctionField.js
+++ b/packages/form-js-viewer/src/render/components/form-fields/JSFunctionField.js
@@ -43,7 +43,7 @@ export function JSFunctionField(props) {
       try {
         value = JSON.parse(JSON.stringify(value));
         onChange({ field, value });
-      } catch (e) {
+      } catch {
         sandboxError('Unparsable return value');
         clearValue();
       }
@@ -96,11 +96,9 @@ export function JSFunctionField(props) {
     const iframe = iframeContainerRef.current.querySelector('iframe');
     iframe.removeAttribute('allow');
 
-    // (3) run user code in sandbox
+    // (3) load user code in sandbox
     _sandbox.promise.then((sandboxInstance) => {
       sandboxInstance
-
-        // @ts-ignore
         .run(wrappedUserCode)
         .then(() => { setSandbox(sandboxInstance); setHasRunLoad(false); });
     });
@@ -108,7 +106,7 @@ export function JSFunctionField(props) {
     return () => {
       _sandbox.destroy();
     };
-  }, [ iframeContainerId, functionDefinition, onChange, field, paramsDefinition, computeOn, interval, safeSetValue, clearValue, sandboxError ]);
+  }, [ clearValue, functionDefinition, iframeContainerId, safeSetValue, sandboxError ]);
 
   const prevParams = usePrevious(params);
   const prevSandbox = usePrevious(sandbox);
@@ -137,7 +135,7 @@ export function JSFunctionField(props) {
       return () => clearInterval(intervalId);
     }
 
-  }, [ params, prevParams, sandbox, prevSandbox, onChange, field, computeOn, hasRunLoad, interval, clearValue, safeSetValue ]);
+  }, [ params, prevParams, sandbox, prevSandbox, field, computeOn, hasRunLoad, interval, clearValue, safeSetValue ]);
 
   return (
     <div ref={ iframeContainerRef } id={ iframeContainerId } className="fjs-sandbox-iframe-container"></div>
diff --git a/packages/form-js-viewer/src/render/components/icons/JSFunction.svg b/packages/form-js-viewer/src/render/components/icons/JSFunction.svg
index 65659169d..b46dbfe8d 100644
--- a/packages/form-js-viewer/src/render/components/icons/JSFunction.svg
+++ b/packages/form-js-viewer/src/render/components/icons/JSFunction.svg
@@ -1,3 +1 @@
-<svg width="54" height="54" viewBox="0 0 54 54" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M15.6852 37.4135H21.3429C23.2922 37.4135 24.8781 35.8276 24.8781 33.8783V16.2H20.6354V33.1708H16.3927V28.9281H12.15V33.8783C12.15 35.8276 13.7359 37.4135 15.6852 37.4135ZM29.1226 37.4135H38.3154C40.2647 37.4135 41.8507 35.8276 41.8507 33.8783V28.9281C41.8507 26.5883 39.9478 24.6854 37.608 24.6854H33.3653V20.4427H41.8507V16.2H32.6578C30.7085 16.2 29.1226 17.7859 29.1226 19.7352V24.6854C29.1226 27.0253 31.0254 28.9281 33.3653 28.9281H37.608V33.1708H29.1226V37.4135Z" fill="currentColor"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="54" height="54" fill="none"><path fill="currentColor" fill-rule="evenodd" d="M15.685 37.413h5.658a3.54 3.54 0 0 0 3.535-3.535V16.2h-4.243v16.97h-4.242v-4.242H12.15v4.95a3.54 3.54 0 0 0 3.535 3.535Zm13.438 0h9.192a3.54 3.54 0 0 0 3.536-3.535v-4.95a4.247 4.247 0 0 0-4.243-4.243h-4.243v-4.242h8.486V16.2h-9.193a3.54 3.54 0 0 0-3.535 3.535v4.95a4.247 4.247 0 0 0 4.242 4.243h4.243v4.243h-8.485v4.242Z" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/packages/form-js-viewer/test/spec/render/components/form-fields/JSFunctionField.spec.js b/packages/form-js-viewer/test/spec/render/components/form-fields/JSFunctionField.spec.js
index e15ca6398..95c925a7d 100644
--- a/packages/form-js-viewer/test/spec/render/components/form-fields/JSFunctionField.spec.js
+++ b/packages/form-js-viewer/test/spec/render/components/form-fields/JSFunctionField.spec.js
@@ -43,17 +43,13 @@ describe('JSFunctionField', function() {
     };
 
     // when
-    act(() => {
+    await act(() => {
       createJSFunctionField({ field, onChange: onChangeSpy, services });
     });
 
-    // wait for the iframe to compute the expression and pass it back
-    await new Promise(r => setTimeout(r, 100)).then(() => {
-
-      // then
-      expect(onChangeSpy).to.be.calledOnce;
-      expect(onChangeSpy).to.be.calledWith({ field, value: 42 });
-    });
+    // then
+    expect(onChangeSpy).to.be.calledOnce;
+    expect(onChangeSpy).to.be.calledWith({ field, value: 42 });
 
   });