diff --git a/res/layout/vpn_dialog.xml b/res/layout/vpn_dialog.xml
index c045cd567d9..fb9fc01793e 100644
--- a/res/layout/vpn_dialog.xml
+++ b/res/layout/vpn_dialog.xml
@@ -13,12 +13,13 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<LinearLayout
+<androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:theme="@style/Theme.Network"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:maxHeight="@dimen/vpn_dialog_max_height"
     android:orientation="vertical"
     android:paddingTop="0dp"
     android:paddingLeft="24dp"
@@ -234,18 +235,21 @@
                         android:text="@string/vpn_save_login"/>
             </LinearLayout>
 
-            <LinearLayout android:id="@+id/connect"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:animateLayoutChanges="true">
-                <CheckBox style="@style/vpn_value"
-                        android:id="@+id/always_on_vpn"
-                        android:text="@string/vpn_menu_lockdown"/>
-                <TextView style="@style/vpn_warning"
-                        android:id="@+id/always_on_invalid_reason"
-                        android:visibility="gone"/>
+            <LinearLayout
+                android:id="@+id/connect"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="@dimen/vpn_dialog_margin_bottom"
+                android:orientation="vertical"
+                android:animateLayoutChanges="true">
+                <CheckBox
+                    android:id="@+id/always_on_vpn"
+                    style="@style/vpn_value"
+                    android:text="@string/vpn_menu_lockdown"/>
+                <TextView
+                    android:id="@+id/always_on_invalid_reason"
+                    style="@style/vpn_warning"/>
             </LinearLayout>
         </LinearLayout>
     </ScrollView>
-</LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml
index c175ee7e591..cbe7e9a2642 100644
--- a/res/values-land/dimens.xml
+++ b/res/values-land/dimens.xml
@@ -33,4 +33,8 @@
 
     <!-- Connected displays -->
     <dimen name="display_topology_pane_margin">80dp</dimen>
+
+    <!-- VPN -->
+    <dimen name="vpn_dialog_max_height">212dp</dimen>
+    <dimen name="vpn_dialog_margin_bottom">8dp</dimen>
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 7fbd86a70d6..89f62a2fdec 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -564,4 +564,8 @@
     <dimen name="locale_picker_dialog_title_padding">16dp</dimen>
     <dimen name="locale_picker_dialog_message_padding_left_right">24dp</dimen>
     <dimen name="locale_picker_dialog_message_padding_bottom">32dp</dimen>
+    
+    <!-- VPN -->
+    <dimen name="vpn_dialog_max_height">600dp</dimen>
+    <dimen name="vpn_dialog_margin_bottom">132dp</dimen>
 </resources>