diff --git a/desktop/app/src/chrome/ShareSheetExportFile.tsx b/desktop/app/src/chrome/ShareSheetExportFile.tsx
index e6fdeb38d..c8c7a3afb 100644
--- a/desktop/app/src/chrome/ShareSheetExportFile.tsx
+++ b/desktop/app/src/chrome/ShareSheetExportFile.tsx
@@ -125,15 +125,14 @@ export default class ShareSheetExportFile extends Component<Props, State> {
         ),
         `${EXPORT_FLIPPER_TRACE_EVENT}:UI_FILE`,
       );
-      this.store.dispatch(unsetShare());
       if (this.state.runInBackground) {
         new Notification('Shareable Flipper Export created', {
           body: `Saved to ${this.props.file}`,
           requireInteraction: true,
         });
-        return;
       }
       this.setState({fetchMetaDataErrors, result: {kind: 'success'}});
+      this.store.dispatch(unsetShare());
       this.props.logger.trackTimeSince(mark, 'export:file-success');
     } catch (err) {
       const result: {
diff --git a/desktop/app/src/chrome/ShareSheetExportUrl.tsx b/desktop/app/src/chrome/ShareSheetExportUrl.tsx
index 45e31f3df..a2aaa522b 100644
--- a/desktop/app/src/chrome/ShareSheetExportUrl.tsx
+++ b/desktop/app/src/chrome/ShareSheetExportUrl.tsx
@@ -154,16 +154,19 @@ export default class ShareSheetExportUrl extends Component<Props, State> {
       getLogger().trackTimeSince(uploadMarker, uploadMarker, {
         plugins: this.store.getState().plugins.selectedPlugins,
       });
-      this.setState({fetchMetaDataErrors, result});
       const flipperUrl = (result as DataExportResult).flipperUrl;
       if (flipperUrl) {
-        clipboard.writeText(String(flipperUrl));
         this.store.dispatch(setExportURL(flipperUrl));
-        new Notification('Shareable Flipper Export created', {
-          body: 'URL copied to clipboard',
-          requireInteraction: true,
-        });
+        if (this.state.runInBackground) {
+          clipboard.writeText(String(flipperUrl));
+          new Notification('Shareable Flipper Export created', {
+            body: 'URL copied to clipboard',
+            requireInteraction: true,
+          });
+        }
       }
+      this.setState({fetchMetaDataErrors, result});
+      this.store.dispatch(unsetShare());
       this.store.dispatch(resetSupportFormV2State());
       this.props.logger.trackTimeSince(mark, 'export:url-success');
     } catch (e) {
diff --git a/desktop/app/src/utils/exportData.tsx b/desktop/app/src/utils/exportData.tsx
index 0713f9dbe..43534c3a8 100644
--- a/desktop/app/src/utils/exportData.tsx
+++ b/desktop/app/src/utils/exportData.tsx
@@ -383,7 +383,7 @@ export const processStore = async (
 
   if (device) {
     const {serial} = device;
-    statusUpdate && statusUpdate('Capturing screenshot');
+    statusUpdate && statusUpdate('Capturing screenshot...');
     const deviceScreenshot = await capture(device).catch((e) => {
       console.warn('Failed to capture device screenshot when exporting. ' + e);
       return null;
@@ -413,7 +413,7 @@ export const processStore = async (
       idler,
     );
 
-    statusUpdate && statusUpdate('Uploading screenshot');
+    statusUpdate && statusUpdate('Uploading screenshot...');
     const deviceScreenshotLink =
       deviceScreenshot &&
       (await uploadFlipperMedia(deviceScreenshot, 'Image').catch((e) => {