diff --git a/data/media/github-md.css b/data/media/github-md.css
index 571fe4a..4fa2463 100644
--- a/data/media/github-md.css
+++ b/data/media/github-md.css
@@ -36,6 +36,22 @@
   box-sizing: border-box;
 }
 
+html {
+  font-size: 16px;
+}
+
+@media screen and (max-width: 799px) {
+  html {
+    font-size: 14px;
+  }
+}
+
+@media screen and (min-width: 1000px) {
+  html {
+    font-size: 18px;
+  }
+}
+
 body {
   color: var(--text-color);
   background-color: var(--background-color);
diff --git a/uberwriter/UberwriterWindow.py b/uberwriter/UberwriterWindow.py
index c51f828..43e7111 100644
--- a/uberwriter/UberwriterWindow.py
+++ b/uberwriter/UberwriterWindow.py
@@ -487,8 +487,8 @@ class UberwriterWindow(Gtk.ApplicationWindow):
         self.window_height = widget.get_allocation().height
         w_width = widget.get_allocation().width
         # Calculate left / right margin
-        width_request = 600
         if w_width < 900:
+            width_request = 600
             self.markup_buffer.set_multiplier(8)
             self.current_font_size = 12
             self.alignment_padding = 30
@@ -498,8 +498,8 @@ class UberwriterWindow(Gtk.ApplicationWindow):
             self.get_style_context().add_class("small")
 
         elif w_width < 1400:
-            self.markup_buffer.set_multiplier(10)
             width_request = 800
+            self.markup_buffer.set_multiplier(10)
             self.current_font_size = 15
             self.alignment_padding = 40
             lm = 7 * 10
@@ -508,9 +508,9 @@ class UberwriterWindow(Gtk.ApplicationWindow):
             self.get_style_context().add_class("medium")
 
         else:
+            width_request = 1000
             self.markup_buffer.set_multiplier(13)
             self.current_font_size = 17
-            width_request = 1000
             self.alignment_padding = 60
             lm = 7 * 13
             self.get_style_context().remove_class("medium")