diff --git a/CHANGES.md b/CHANGES.md
index c9c9c5d035..6a1b5447e4 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -8,7 +8,7 @@ Improvements 🙌:
  -
 
 Bugfix 🐛:
- -
+ - Sidebar too large in horizontal orientation or tablets (#475)
 
 Translations 🗣:
  -
diff --git a/vector/src/main/res/layout/activity_home.xml b/vector/src/main/res/layout/activity_home.xml
index 50fc11500a..a41256fb84 100644
--- a/vector/src/main/res/layout/activity_home.xml
+++ b/vector/src/main/res/layout/activity_home.xml
@@ -25,7 +25,7 @@
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/homeDrawerFragmentContainer"
-        android:layout_width="match_parent"
+        android:layout_width="@dimen/navigation_drawer_max_width"
         android:layout_height="match_parent"
         android:layout_gravity="start" />
 
diff --git a/vector/src/main/res/values-sw600dp/dimens.xml b/vector/src/main/res/values-sw600dp/dimens.xml
new file mode 100644
index 0000000000..204d663d9c
--- /dev/null
+++ b/vector/src/main/res/values-sw600dp/dimens.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Navigation Drawer -->
+    <dimen name="navigation_drawer_max_width">400dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values/dimens.xml b/vector/src/main/res/values/dimens.xml
index ccb7ae7726..06ca39950c 100644
--- a/vector/src/main/res/values/dimens.xml
+++ b/vector/src/main/res/values/dimens.xml
@@ -33,4 +33,7 @@
     <!-- Max width for some buttons -->
     <dimen name="button_max_width">280dp</dimen>
 
+    <!-- Navigation Drawer -->
+    <dimen name="navigation_drawer_max_width">320dp</dimen>
+
 </resources>
\ No newline at end of file