diff --git a/packages/neos-ui/src/Containers/Modals/NodeCreationDialog/index.js b/packages/neos-ui/src/Containers/Modals/NodeCreationDialog/index.js
index c86d6b6f7c..70a14357af 100644
--- a/packages/neos-ui/src/Containers/Modals/NodeCreationDialog/index.js
+++ b/packages/neos-ui/src/Containers/Modals/NodeCreationDialog/index.js
@@ -307,7 +307,7 @@ export default class NodeCreationDialog extends PureComponent {
                 actions={[this.renderBackAction(), this.renderSaveAction()]}
                 title={this.renderTitle()}
                 onRequestClose={this.handleCancel}
-                preventClosing={true}
+                preventClosing={this.state.isDirty}
                 type="success"
                 isOpen
                 style={this.state.secondaryInspectorComponent ? 'jumbo' : 'wide'}
diff --git a/packages/react-ui-components/src/Dialog/dialog.tsx b/packages/react-ui-components/src/Dialog/dialog.tsx
index 863efb789f..7f391b81ab 100644
--- a/packages/react-ui-components/src/Dialog/dialog.tsx
+++ b/packages/react-ui-components/src/Dialog/dialog.tsx
@@ -129,7 +129,7 @@ class DialogWithOverlay extends PureComponent<DialogProps> {
 
         const finalClassNameBody = mergeClassNames(
             theme.dialog__body,
-            {
+            this.state.isShaking ? theme['dialog--warn'] : {
                 [theme['dialog--success']]: type === 'success',
                 [theme['dialog--warn']]: type === 'warn',
                 [theme['dialog--error']]: type === 'error',
@@ -201,7 +201,7 @@ class DialogWithOverlay extends PureComponent<DialogProps> {
                 [theme['dialog--jumbo']]: style === 'jumbo',
                 [theme['dialog--narrow']]: style === 'narrow',
             },
-            {
+            this.state.isShaking ? theme['dialog--warn'] : {
                 [theme['dialog--success']]: type === 'success',
                 [theme['dialog--warn']]: type === 'warn',
                 [theme['dialog--error']]: type === 'error',