diff --git a/ts/components/SessionWrapperModal.tsx b/ts/components/SessionWrapperModal.tsx
index c317132e6..32123f14b 100644
--- a/ts/components/SessionWrapperModal.tsx
+++ b/ts/components/SessionWrapperModal.tsx
@@ -108,17 +108,16 @@ export const SessionWrapperModal = (props: SessionWrapperModalType) => {
               {props.children}
 
               <div className="session-modal__button-group">
-                {onConfirm ? (
-                  <SessionButton onClick={props.onConfirm}>
-                    {confirmText || window.i18n('ok')}
-                  </SessionButton>
-                ) : null}
-
                 {onClose && showClose ? (
                   <SessionButton onClick={props.onClose}>
                     {cancelText || window.i18n('close')}
                   </SessionButton>
                 ) : null}
+                {onConfirm ? (
+                  <SessionButton onClick={props.onConfirm}>
+                    {confirmText || window.i18n('ok')}
+                  </SessionButton>
+                ) : null}
               </div>
             </div>
           </div>
diff --git a/ts/components/dialog/AdminLeaveClosedGroupDialog.tsx b/ts/components/dialog/AdminLeaveClosedGroupDialog.tsx
index 84c2bde89..c38086bc1 100644
--- a/ts/components/dialog/AdminLeaveClosedGroupDialog.tsx
+++ b/ts/components/dialog/AdminLeaveClosedGroupDialog.tsx
@@ -37,8 +37,8 @@ export const AdminLeaveClosedGroupDialog = (props: Props) => {
       <p>{warningAsAdmin}</p>
 
       <div className="session-modal__button-group">
-        <SessionButton text={okText} onClick={onClickOK} buttonColor={SessionButtonColor.Danger} />
         <SessionButton text={cancelText} onClick={closeDialog} />
+        <SessionButton text={okText} onClick={onClickOK} buttonColor={SessionButtonColor.Danger} />
       </div>
     </SessionWrapperModal>
   );
diff --git a/ts/components/dialog/SessionNicknameDialog.tsx b/ts/components/dialog/SessionNicknameDialog.tsx
index 846076405..6739b11ab 100644
--- a/ts/components/dialog/SessionNicknameDialog.tsx
+++ b/ts/components/dialog/SessionNicknameDialog.tsx
@@ -70,12 +70,12 @@ export const SessionNicknameDialog = (props: Props) => {
       />
 
       <div className="session-modal__button-group">
+        <SessionButton text={window.i18n('cancel')} onClick={onClickClose} />
         <SessionButton
           text={window.i18n('ok')}
           onClick={saveNickname}
           buttonColor={SessionButtonColor.Green}
         />
-        <SessionButton text={window.i18n('cancel')} onClick={onClickClose} />
       </div>
     </SessionWrapperModal>
   );
diff --git a/ts/components/dialog/SessionPasswordDialog.tsx b/ts/components/dialog/SessionPasswordDialog.tsx
index bf2feb4af..e492fe52c 100644
--- a/ts/components/dialog/SessionPasswordDialog.tsx
+++ b/ts/components/dialog/SessionPasswordDialog.tsx
@@ -104,13 +104,12 @@ export class SessionPasswordDialog extends React.Component<Props, State> {
         {this.showError()}
 
         <div className="session-modal__button-group">
+          <SessionButton text={window.i18n('cancel')} onClick={this.closeDialog} />
           <SessionButton
             text={window.i18n('ok')}
             buttonColor={confirmButtonColor}
             onClick={this.setPassword}
           />
-
-          <SessionButton text={window.i18n('cancel')} onClick={this.closeDialog} />
         </div>
       </SessionWrapperModal>
     );
diff --git a/ts/components/dialog/SessionSeedModal.tsx b/ts/components/dialog/SessionSeedModal.tsx
index 38930869b..43bafc71d 100644
--- a/ts/components/dialog/SessionSeedModal.tsx
+++ b/ts/components/dialog/SessionSeedModal.tsx
@@ -71,9 +71,8 @@ const Password = (props: PasswordProps) => {
       <SpacerLG />
 
       <div className="session-modal__button-group">
-        <SessionButton text={i18n('ok')} onClick={confirmPassword} />
-
         <SessionButton text={i18n('cancel')} onClick={onClose} />
+        <SessionButton text={i18n('ok')} onClick={confirmPassword} />
       </div>
     </>
   );