diff --git a/data/uberwriter.gresource.xml b/data/uberwriter.gresource.xml
index c875ef3..2f90616 100644
--- a/data/uberwriter.gresource.xml
+++ b/data/uberwriter.gresource.xml
@@ -9,7 +9,6 @@
     <file compressed="true" preprocess="xml-stripblanks">ui/Export.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">ui/Menu.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">ui/Preferences.ui</file>
-    <file compressed="true" preprocess="xml-stripblanks">ui/Preview.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">ui/Recents.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">ui/Shortcuts.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">ui/Window.ui</file>
diff --git a/data/ui/Preview.ui b/data/ui/Preview.ui
deleted file mode 100644
index ddc354b..0000000
--- a/data/ui/Preview.ui
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
-<interface>
-  <requires lib="gtk+" version="3.20"/>
-  <object class="GtkImage" id="pan-down">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">pan-down-symbolic</property>
-    <property name="icon_size">2</property>
-  </object>
-  <object class="GtkBox" id="preview">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="vexpand">True</property>
-    <property name="orientation">vertical</property>
-    <child>
-      <placeholder/>
-    </child>
-    <child>
-      <object class="GtkRevealer" id="preview_mode_revealer">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="transition_type">crossfade</property>
-        <property name="transition_duration">750</property>
-        <property name="reveal_child">True</property>
-        <child>
-          <object class="GtkButton" id="preview_mode_button">
-            <property name="label" translatable="yes">Full-Width</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="tooltip_text" translatable="yes">Switch Preview Mode</property>
-            <property name="halign">end</property>
-            <property name="image">pan-down</property>
-            <property name="image_position">right</property>
-            <property name="always_show_image">True</property>
-            <style>
-              <class name="inline-button"/>
-            </style>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="pack_type">end</property>
-        <property name="position">1</property>
-      </packing>
-    </child>
-  </object>
-</interface>
diff --git a/uberwriter/main_window.py b/uberwriter/main_window.py
index 997e948..ec0126f 100644
--- a/uberwriter/main_window.py
+++ b/uberwriter/main_window.py
@@ -139,7 +139,6 @@ class MainWindow(StyledWindow):
         # Setup header/stats bar
         self.headerbar_visible = True
         self.bottombar_visible = True
-        self.previewbars_visible = True
         self.buffer_modified_for_status_bar = False
 
         # Init file name with None
@@ -595,12 +594,6 @@ class MainWindow(StyledWindow):
 
             self.headerbar_visible = True
 
-        if not self.previewbars_visible:
-            for revealer in self.preview_handler.get_top_bottom_bar_revealers():
-                revealer.set_reveal_child(True)
-
-            self.previewbars_visible = True
-
     def reveal_bottombar(self, _widget=None, _data=None):
 
         if not self.bottombar_visible:
@@ -624,11 +617,6 @@ class MainWindow(StyledWindow):
 
             self.bottombar_visible = False
 
-        if self.previewbars_visible:
-            for revealer in self.preview_handler.get_top_bottom_bar_revealers():
-                revealer.set_reveal_child(False)
-
-            self.previewbars_visible = False
 
         self.buffer_modified_for_status_bar = False
 
diff --git a/uberwriter/preview_handler.py b/uberwriter/preview_handler.py
index d4c20aa..1e3a2c6 100644
--- a/uberwriter/preview_handler.py
+++ b/uberwriter/preview_handler.py
@@ -32,16 +32,9 @@ class PreviewHandler:
         self.web_view = None
         self.web_view_pending_html = None
 
-        builder = Gtk.Builder()
-        builder.add_from_resource(
-            "/de/wolfvollprecht/UberWriter/ui/Preview.ui")
-        # preview = builder.get_object("preview")
-        mode_button = builder.get_object("preview_mode_button")
-        self.mode_revealer = builder.get_object("preview_mode_revealer")
-
         self.preview_converter = PreviewConverter()
         self.preview_renderer = PreviewRenderer(
-            window, content, editor, text_view, self.mode_revealer, mode_button)
+            window, content, editor, text_view)
 
         window.connect("style-updated", self.reload)
 
@@ -135,12 +128,6 @@ class PreviewHandler:
     def update_preview_mode(self):
         self.preview_renderer.update_mode(self.web_view)
 
-    def get_top_bottom_bar_revealers(self):
-        if self.shown and not self.preview_renderer.window:
-            return [self.mode_revealer]
-        else:
-            return []
-
     def on_load_changed(self, _web_view, event):
         if event == WebKit2.LoadEvent.FINISHED:
             self.loading = False
diff --git a/uberwriter/preview_renderer.py b/uberwriter/preview_renderer.py
index 15290ef..3e81d7a 100644
--- a/uberwriter/preview_renderer.py
+++ b/uberwriter/preview_renderer.py
@@ -17,15 +17,12 @@ class PreviewRenderer:
     WINDOWED = 3
 
     def __init__(
-            self, main_window, content, editor, text_view, mode_revealer, mode_button):
+            self, main_window, content, editor, text_view):
         self.main_window = main_window
         self.main_window.connect("delete-event", self.on_window_closed)
         self.content = content
         self.editor = editor
         self.text_view = text_view
-        self.mode_revealer = mode_revealer
-        self.mode_button = mode_button
-        self.mode_button.connect("clicked", self.show_mode_popover)
 
         self.settings = Settings.new()
         self.popover = None
@@ -48,9 +45,6 @@ class PreviewRenderer:
             headerbar = headerbars.PreviewHeaderbar()
             self.headerbar = headerbar.hb
             self.headerbar.set_title(_("Preview"))
-            self.mode_button.get_style_context().remove_class("inline-button")
-            self.mode_revealer.remove(self.mode_button)
-            self.headerbar.pack_end(self.mode_button)
             self.window.set_titlebar(headerbar.hb_container)
 
             # Position it next to the main window.
@@ -95,9 +89,6 @@ class PreviewRenderer:
         # Windowed preview: remove preview and destroy window.
         if self.mode == self.WINDOWED:
             self.main_window.present()
-            self.headerbar.remove(self.mode_button)
-            self.mode_button.get_style_context().add_class("inline-button")
-            self.mode_revealer.add(self.mode_button)
             self.headerbar = None
             self.window.remove(web_view)
             self.window.destroy()
@@ -127,32 +118,6 @@ class PreviewRenderer:
             self.show(web_view)
         else:
             self.mode = mode
-        if self.mode_button:
-            text = self.get_text_for_preview_mode(self.mode)
-            self.mode_button.set_label(text)
-        if self.popover:
-            self.popover.popdown()
-
-    def show_mode_popover(self, button):
-        """Show preview mode popover."""
-
-        self.mode_button.set_state_flags(Gtk.StateFlags.CHECKED, False)
-
-        menu = Gio.Menu()
-        modes = self.settings.props.settings_schema.get_key("preview-mode").get_range()[1]
-        for i, mode in enumerate(modes):
-            menu_item = Gio.MenuItem.new(self.get_text_for_preview_mode(i), None)
-            menu_item.set_action_and_target_value("app.preview_mode", GLib.Variant.new_string(mode))
-            menu.append_item(menu_item)
-        self.popover = Gtk.Popover.new_from_model(button, menu)
-        self.popover.connect('closed', self.on_popover_closed)
-        self.popover.popup()
-
-    def on_popover_closed(self, _popover):
-        self.mode_button.unset_state_flags(Gtk.StateFlags.CHECKED)
-
-        self.popover = None
-        self.text_view.grab_focus()
 
     def on_window_closed(self, window, _event):
         preview_action = window.get_application().lookup_action("preview")
diff --git a/uberwriter/preview_web_view.py b/uberwriter/preview_web_view.py
index 7e02fcb..f242596 100644
--- a/uberwriter/preview_web_view.py
+++ b/uberwriter/preview_web_view.py
@@ -62,6 +62,8 @@ if (canScroll && isRendered) {{
         self.connect("load-failed", self.on_load_failed)
         self.connect("destroy", self.on_destroy)
 
+        self.props.expand = True
+
         self.scroll_scale = -1
 
         self.state_loaded = False