diff --git a/src/dialogs/config-flow/dialog-data-entry-flow.ts b/src/dialogs/config-flow/dialog-data-entry-flow.ts
index 228cead5ce..5cb369c0f0 100644
--- a/src/dialogs/config-flow/dialog-data-entry-flow.ts
+++ b/src/dialogs/config-flow/dialog-data-entry-flow.ts
@@ -35,6 +35,7 @@ import "./step-flow-external";
 import "./step-flow-form";
 import "./step-flow-loading";
 import "./step-flow-pick-handler";
+import { computeRTL } from "../../common/util/compute_rtl";
 
 let instance = 0;
 
@@ -147,6 +148,7 @@ class DataEntryFlowDialog extends LitElement {
                   )}
                   icon="hass:close"
                   dialogAction="close"
+                  ?rtl=${computeRTL(this.hass)}
                 ></ha-icon-button>
                 ${this._step === null
                   ? // Show handler picker
@@ -318,6 +320,10 @@ class DataEntryFlowDialog extends LitElement {
           top: 0;
           right: 0;
         }
+        ha-icon-button[rtl] {
+          right: auto;
+          left: 0;
+        }
       `,
     ];
   }