diff --git a/redisinsight/ui/src/pages/home/components/AddInstanceForm/InstanceForm/InstanceForm.tsx b/redisinsight/ui/src/pages/home/components/AddInstanceForm/InstanceForm/InstanceForm.tsx
index 7a7598e88e..9b948cc74a 100644
--- a/redisinsight/ui/src/pages/home/components/AddInstanceForm/InstanceForm/InstanceForm.tsx
+++ b/redisinsight/ui/src/pages/home/components/AddInstanceForm/InstanceForm/InstanceForm.tsx
@@ -782,8 +782,8 @@ const AddStandaloneForm = (props: Props) => {
   const TlsDetails = () => (
     <>
       <EuiFlexGroup
-        style={{ padding: '12px 0px 15px' }}
-        className={flexGroupClassName}
+        className={cx(flexGroupClassName, { [styles.tlsContainer]: !flexGroupClassName })}
+        alignItems="center"
       >
         <EuiFlexItem
           style={{ width: '230px' }}
@@ -819,7 +819,7 @@ const AddStandaloneForm = (props: Props) => {
               />
             </EuiFlexItem>
             {formik.values.sni && (
-              <EuiFlexItem className={flexItemClassName}>
+              <EuiFlexItem className={flexItemClassName} style={{ flexBasis: '255px' }}>
                 <EuiFieldText
                   name="servername"
                   id="servername"
@@ -836,7 +836,7 @@ const AddStandaloneForm = (props: Props) => {
                 />
               </EuiFlexItem>
             )}
-            <EuiFlexItem className={flexItemClassName}>
+            <EuiFlexItem className={cx(flexItemClassName, { [styles.fullWidth]: formik.values.sni })}>
               <EuiCheckbox
                 id={`${htmlIdGenerator()()} verifyServerTlsCert`}
                 name="verifyServerTlsCert"
diff --git a/redisinsight/ui/src/pages/home/components/AddInstanceForm/InstanceForm/styles.module.scss b/redisinsight/ui/src/pages/home/components/AddInstanceForm/InstanceForm/styles.module.scss
index 0b2933acc5..2a2f569bcc 100644
--- a/redisinsight/ui/src/pages/home/components/AddInstanceForm/InstanceForm/styles.module.scss
+++ b/redisinsight/ui/src/pages/home/components/AddInstanceForm/InstanceForm/styles.module.scss
@@ -150,3 +150,13 @@
     text-decoration: none !important;
   }
 }
+
+.tlsContainer {
+  min-height: 90px;
+  padding: 12px 0 15px;
+  flex-wrap: wrap;
+}
+
+.fullWidth {
+  flex-basis: 100% !important;
+}