diff --git a/data/ui/Export.ui b/data/ui/Export.ui
index 5880ccf..67c4f40 100644
--- a/data/ui/Export.ui
+++ b/data/ui/Export.ui
@@ -506,20 +506,28 @@
       <mime-type>application/pdf</mime-type>
     </mime-types>
   </object>
-  <object class="GtkWindow" id="Export">
+  <object class="GtkDialog" id="Export">
     <property name="can_focus">False</property>
-    <property name="window_position">center-on-parent</property>
+    <property name="type_hint">dialog</property>
+    <action-widgets>
+      <action-widget response="cancel">cancel_btn</action-widget>
+      <action-widget response="1" default="true">export_btn</action-widget>
+    </action-widgets>
     <child type="titlebar">
       <object class="GtkHeaderBar" id="Export_hb">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <child>
           <object class="GtkButton" id="cancel_btn">
-            <property name="label" translatable="yes">Cancel</property>
+            <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 type="title">
           <object class="GtkStackSwitcher" id="format_switcher">
@@ -542,60 +550,83 @@
         </child>
       </object>
     </child>
-    <child>
-      <object class="GtkStack" id="export_stack">
-        <property name="visible">True</property>
+    <child internal-child="vbox">
+      <object class="GtkBox" id="DialogBox">
         <property name="can_focus">False</property>
-        <child>
-          <object class="GtkFileChooserWidget" id="export_pdf">
-            <property name="visible">True</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">2</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox" id="ButtonBox">
             <property name="can_focus">False</property>
-            <property name="action">save</property>
-            <property name="filter">pdf_filter</property>
           </object>
           <packing>
-            <property name="name">export_pdf</property>
-            <property name="title" translatable="yes">PDF</property>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">0</property>
           </packing>
         </child>
         <child>
-          <object class="GtkFileChooserWidget" id="export_html">
+          <object class="GtkStack" id="export_stack">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="action">save</property>
-            <property name="filter">html_filter</property>
+            <property name="transition_type">crossfade</property>
+            <child>
+              <object class="GtkFileChooserWidget" id="pdf">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="action">save</property>
+                <property name="filter">pdf_filter</property>
+              </object>
+              <packing>
+                <property name="name">pdf</property>
+                <property name="title" translatable="yes">PDF</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkFileChooserWidget" id="html">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="action">save</property>
+                <property name="filter">html_filter</property>
+              </object>
+              <packing>
+                <property name="name">html</property>
+                <property name="title" translatable="yes">HTML</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkFileChooserWidget" id="odt">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="action">save</property>
+                <property name="filter">odt_filter</property>
+              </object>
+              <packing>
+                <property name="name">odt</property>
+                <property name="title" translatable="yes">ODT</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkFileChooserWidget" id="export_advanced">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="extra_widget">advanced_export_options</property>
+              </object>
+              <packing>
+                <property name="name">page0</property>
+                <property name="title" translatable="yes">Advanced</property>
+                <property name="position">3</property>
+              </packing>
+            </child>
           </object>
           <packing>
-            <property name="name">export_html</property>
-            <property name="title" translatable="yes">HTML</property>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
-        <child>
-          <object class="GtkFileChooserWidget" id="export_odt">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="action">save</property>
-            <property name="filter">odt_filter</property>
-          </object>
-          <packing>
-            <property name="name">export_odt</property>
-            <property name="title" translatable="yes">ODT</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkFileChooserWidget">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="extra_widget">advanced_export_options</property>
-          </object>
-          <packing>
-            <property name="name">page0</property>
-            <property name="title" translatable="yes">Advanced</property>
-            <property name="position">3</property>
-          </packing>
-        </child>
       </object>
     </child>
   </object>