diff --git a/webapp/packages/plugin-connection-template/src/ConnectionDialog/ConnectionDialog.tsx b/webapp/packages/plugin-connection-template/src/ConnectionDialog/ConnectionDialog.tsx
index f3a6c9a4d6..b5d95c5103 100644
--- a/webapp/packages/plugin-connection-template/src/ConnectionDialog/ConnectionDialog.tsx
+++ b/webapp/packages/plugin-connection-template/src/ConnectionDialog/ConnectionDialog.tsx
@@ -82,12 +82,12 @@ export const ConnectionDialog: DialogComponent<null, null> = observer(function C
               />
             </SubmittingForm>
           ))}
-        {controller.responseMessage && (
-          <ErrorMessage text={controller.responseMessage} hasDetails={controller.hasDetails} onShowDetails={controller.onShowDetails} />
-        )}
       </CommonDialogBody>
       {controller.step === ConnectionStep.Connection && (
         <CommonDialogFooter>
+          {controller.responseMessage && (
+            <ErrorMessage text={controller.responseMessage} hasDetails={controller.hasDetails} onShowDetails={controller.onShowDetails} />
+          )}
           <ConnectionDialogFooter
             isConnecting={controller.isConnecting}
             onBack={() => controller.onStep(ConnectionStep.ConnectionTemplateSelect)}
diff --git a/webapp/packages/plugin-connection-template/src/ConnectionDialog/ConnectionDialogFooter.tsx b/webapp/packages/plugin-connection-template/src/ConnectionDialog/ConnectionDialogFooter.tsx
index bb8582c617..d297bf3842 100644
--- a/webapp/packages/plugin-connection-template/src/ConnectionDialog/ConnectionDialogFooter.tsx
+++ b/webapp/packages/plugin-connection-template/src/ConnectionDialog/ConnectionDialogFooter.tsx
@@ -37,11 +37,11 @@ interface Props {
 export const ConnectionDialogFooter = observer<Props>(function ConnectionDialogFooter({ isConnecting, onConnect, onBack }) {
   const translate = useTranslate();
   return styled(styles)(
-    <controls as="div">
+    <controls>
+      <fill />
       <Button type="button" mod={['outlined']} disabled={isConnecting} onClick={onBack}>
         {translate('ui_stepper_back')}
       </Button>
-      <fill as="div" />
       <Button type="button" mod={['unelevated']} disabled={isConnecting} onClick={onConnect}>
         {isConnecting ? translate('basicConnection_connectionDialog_connecting') : translate('connections_connection_connect')}
       </Button>