diff --git a/gtk2_ardour/ui/waves_export_dialog.xml b/gtk2_ardour/ui/waves_export_dialog.xml
index eb3c399d3e..4e733f5319 100644
--- a/gtk2_ardour/ui/waves_export_dialog.xml
+++ b/gtk2_ardour/ui/waves_export_dialog.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Dialog title="Tracks Live">
+<Dialog title="Tracks Live" CACHEIT="false">
   <style name="generic_control"
          winfont ="Arial Bold 10"
          macfont ="Helvetica Bold 10"
@@ -25,89 +25,95 @@
   <EventBox bgnormal="#EDECE8"
             box.pack="end">
     <VBox>
-      <EventBox bgnormal="#CACAC5">
-        <HBox spacing="1">
-          <Button id="file_format_selector_button"
-                  style="tab_button"
-                  text="File Format"/>
-          <Button id="timespan_selector_button"
-                  style="tab_button"
-                  text="Time Span"/>
-          <Button id="channel_selector_button"
-                  style="tab_button"
-                  text="Channels"/>
-        </HBox>
-      </EventBox>
-      <VBox borderwidth="10">
-        <EventBox id="selectors_home"
-                  bgnormal="#EDECE8"
-                  width="642"
-                  height="210">
-          <VBox id="file_format_selector">
-            <HBox id="preset_selector_home" ui.orphan="true"/>
-            <HBox id="file_notebook_home"/>
-          </VBox>
-          <VBox id="timespan_selector_home"/>
-          <VBox id="channel_selector_home"/>
+      <VBox id="settings_home">
+        <EventBox bgnormal="#CACAC5">
+          <HBox spacing="1">
+            <Button id="file_format_selector_button"
+                    style="tab_button"
+                    text="File Format"/>
+            <Button id="timespan_selector_button"
+                    style="tab_button"
+                    text="Time Span"/>
+            <Button id="channel_selector_button"
+                    style="tab_button"
+                    text="Channels"/>
+          </HBox>
         </EventBox>
-        <VBox spacing="10"
-              box.fill="false"
-              box.expand="">
+        <VBox borderwidth="10">
+          <EventBox id="selectors_home"
+                    bgnormal="#EDECE8"
+                    width="642"
+                    height="210">
+            <VBox id="file_format_selector">
+              <HBox id="preset_selector_home" ui.orphan="true"/>
+              <HBox id="file_notebook_home"/>
+            </VBox>
+            <VBox id="timespan_selector_home"/>
+            <VBox id="channel_selector_home"/>
+          </EventBox>
           <VBox spacing="10"
-                id="warning_widget">
+                 id="warning_widget">
             <HBox box.expand="true">
-                <Label id="error_label"
-                       style="generic_control"
-                       usemarkup="true"
-                       box.pack="start"
-                       fgnormal="#FF0000"/>
+              <Label id="error_label"
+                     style="generic_control"
+                     usemarkup="true"
+                     box.pack="start"
+                     fgnormal="#FF0000"/>
             </HBox>
             <HBox box.expand="true">
-                <Label id="warn_label"
-                       style="generic_control"
-                       usemarkup="true"
-                       box.pack="start"
-                       fgnormal="#E2974B"/>
+              <Label id="warn_label"
+                     style="generic_control"
+                     usemarkup="true"
+                     box.pack="start"
+                     fgnormal="#E2974B"/>
             </HBox>
             <VBox height="22">
-                <HBox id="list_files_widget"
-                      spacing="10"
-                      box.expand="true">
-                    <Label style="generic_control"
-                           text="Some already existing files will be overwritten."
-                           box.pack="start"
-                           fgnormal="#E2974B"/>
-                    <Button id="list_files_button"
-                            style="generic_button"
-                            box.pack="end"
-                            text="List Files"/>
-                </HBox>
+              <HBox id="list_files_widget"
+                    spacing="10"
+                    box.expand="true">
+                <Label style="generic_control"
+                       text="Some already existing files will be overwritten."
+                       box.pack="start"
+                       fgnormal="#E2974B"/>
+                <Button id="list_files_button"
+                        style="generic_button"
+                        box.pack="end"
+                        text="List Files"/>
+              </HBox>
             </VBox>
           </VBox>
-          <VBox id="export_progress_widget">
-              <ProgressBar id="export_progress_bar"
-                           height="22"
-                           bgnormal="#6B6B6B"
-                           bgselected="#20B2AA"/>
-          </VBox>
-          <HBox spacing="10" >
-            <Button id="export_button"
-                    style="generic_button"
-                    box.pack="end"
-                    text="Export"/>
-            <Button id="cancel_button"
-                    style="generic_button"
-                    box.pack="end"
-                    text="Cancel"/>
-            <Button id="stop_export_button"
-                    style="generic_button"
-                    box.pack="end"
-                    visible="false"
-                    noshowall="true"
-                    text="Stop Export"/>
-          </HBox>
-        </VBox>        
+        </VBox>
       </VBox>
+      <HBox id="export_progress_widget" box.padding="10">
+        <ProgressBar id="export_progress_bar"
+                     width="642"
+                     height="22"
+                     bgnormal="#6B6B6B"
+                     bgselected="#20B2AA"
+                     box.padding="10"
+                     box.fill="true"
+                     box.expand="true"/>
+      </HBox>
+      <HBox>
+        <Button id="export_button"
+                style="generic_button"
+                box.pack="end"
+                text="Export"
+                box.padding="10"/>
+        <Button id="cancel_button"
+                style="generic_button"
+                box.pack="end"
+                text="Cancel"
+                box.padding="10"/>
+        <Button id="stop_export_button"
+                style="generic_button"
+                box.pack="end"
+                visible="false"
+                noshowall="true"
+                text="Stop Export"
+                box.padding="10"/>
+      </HBox>
+      <HBox height="10"/>
     </VBox>
   </EventBox>
 </Dialog>
\ No newline at end of file
diff --git a/gtk2_ardour/waves_export_dialog.cc b/gtk2_ardour/waves_export_dialog.cc
index 31b8712fcc..c6f119c58f 100644
--- a/gtk2_ardour/waves_export_dialog.cc
+++ b/gtk2_ardour/waves_export_dialog.cc
@@ -324,6 +324,7 @@ void
 WavesExportDialog::do_export (WavesButton*)
 {
 	try {
+		get_container ("settings_home").hide ();
 		profile_manager->prepare_for_export ();
 		handler->soundcloud_username     = soundcloud_selector->username ();
 		handler->soundcloud_password     = soundcloud_selector->password ();