diff --git a/data/ui/Export.ui b/data/ui/Export.ui
index 8d71eb4..304e4f9 100644
--- a/data/ui/Export.ui
+++ b/data/ui/Export.ui
@@ -597,40 +597,27 @@
   <object class="GtkDialog" id="Export">
     <property name="can_focus">False</property>
     <property name="type_hint">dialog</property>
+    <property name="use-header-bar">1</property>
     <action-widgets>
       <action-widget response="cancel">cancel_btn</action-widget>
       <action-widget response="accept" default="true">export_btn</action-widget>
     </action-widgets>
-    <child type="titlebar">
-      <object class="GtkHeaderBar" id="Export_hb">
+    <child type="action">
+      <object class="GtkButton" id="cancel_btn">
+        <property name="label">gtk-cancel</property>
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="has_subtitle">False</property>
-        <child>
-          <object class="GtkButton" id="cancel_btn">
-            <property name="label">gtk-cancel</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="use_stock">True</property>
-          </object>
-          <packing>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkButton" id="export_btn">
-            <property name="label" translatable="yes">Export</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="can_default">True</property>
-            <property name="receives_default">True</property>
-          </object>
-          <packing>
-            <property name="pack_type">end</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
+        <property name="can_focus">True</property>
+        <property name="receives_default">True</property>
+        <property name="use_stock">True</property>
+      </object>
+    </child>
+    <child type="action">
+      <object class="GtkButton" id="export_btn">
+        <property name="label" translatable="yes">Export</property>
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="can_default">True</property>
+        <property name="receives_default">True</property>
       </object>
     </child>
     <child internal-child="vbox">
@@ -664,43 +651,5 @@
         </child>
       </object>
     </child>
-    <child type="titlebar">
-      <object class="GtkHeaderBar" id="Export_hb">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <child type="title">
-          <object class="GtkStackSwitcher" id="format_switcher">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="stack">export_stack</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkButton" id="cancel_btn">
-            <property name="label">gtk-cancel</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="use_stock">True</property>
-          </object>
-          <packing>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkButton" id="export_btn">
-            <property name="label" translatable="yes">Export</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="can_default">True</property>
-            <property name="receives_default">True</property>
-          </object>
-          <packing>
-            <property name="pack_type">end</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
-      </object>
-    </child>
   </object>
 </interface>
diff --git a/uberwriter/export_dialog.py b/uberwriter/export_dialog.py
index b8a040b..29de0c4 100644
--- a/uberwriter/export_dialog.py
+++ b/uberwriter/export_dialog.py
@@ -191,7 +191,7 @@ class Export:
         if response == Gtk.ResponseType.ACCEPT:
             try:
                 self.export(export_format, text)
-            except (NotADirectoryError, Exception) as e:
+            except (NotADirectoryError, RuntimeError) as e:
                 dialog = Gtk.MessageDialog(None,
                                        Gtk.DialogFlags.MODAL | Gtk.DialogFlags.DESTROY_WITH_PARENT,
                                        Gtk.MessageType.ERROR,
@@ -201,8 +201,9 @@ class Export:
                                        )
                 dialog.run()
                 dialog.destroy()
-
         
+        self.dialog.destroy()
+
     def regular_export_dialog(self):
         texlive_installed = helpers.exist_executable("pdftex")
 
@@ -260,6 +261,7 @@ class Export:
 
         self.adv_export_name = self.builder.get_object("advanced_export_name")
         self.adv_export_name.set_text(os.path.basename(self.filename)[:-3])
+        self.paper_size = self.builder.get_object("combobox_paper_size")
 
         return self.builder.get_object("Export")
 
@@ -298,6 +300,7 @@ class Export:
             args = [
                 "--variable=papersize:a4"
             ]
+            filename = self.dialog.get_filename()
             if filename.endswith("." + export_type):
                 filename = filename[:-len(export_type)-1]
             output_dir = os.path.abspath(os.path.join(filename, os.path.pardir))