diff --git a/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/tunnels/TunnelsScreen.kt b/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/tunnels/TunnelsScreen.kt
index 3719f404..ecc29f71 100644
--- a/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/tunnels/TunnelsScreen.kt
+++ b/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/tunnels/TunnelsScreen.kt
@@ -107,6 +107,7 @@ fun TunnelsScreen(viewModel: TunnelsViewModel) {
     if (showExportSheet) {
         ExportTunnelsBottomSheet({ type, uri ->
             sharedViewModel.exportSelectedTunnels(type, uri)
+            showExportSheet = false
         }) {
             showExportSheet = false
             sharedViewModel.clearSelectedTunnels()
diff --git a/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/tunnels/components/ExportTunnelsBottomSheet.kt b/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/tunnels/components/ExportTunnelsBottomSheet.kt
index 4b9fc5f3..337b203d 100644
--- a/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/tunnels/components/ExportTunnelsBottomSheet.kt
+++ b/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/tunnels/components/ExportTunnelsBottomSheet.kt
@@ -30,7 +30,7 @@ fun ExportTunnelsBottomSheet(
             mimeType = FileUtils.ZIP_FILE_MIME_TYPE,
             onResult = { file ->
                 if (file != null) {
-                    onExport(ConfigType.WG, file)
+                    onExport(exportConfigType, file)
                 } else onDismiss()
             },
         )
diff --git a/app/src/main/java/com/zaneschepke/wireguardautotunnel/viewmodel/SharedAppViewModel.kt b/app/src/main/java/com/zaneschepke/wireguardautotunnel/viewmodel/SharedAppViewModel.kt
index c78b97e7..01a712ff 100644
--- a/app/src/main/java/com/zaneschepke/wireguardautotunnel/viewmodel/SharedAppViewModel.kt
+++ b/app/src/main/java/com/zaneschepke/wireguardautotunnel/viewmodel/SharedAppViewModel.kt
@@ -270,6 +270,10 @@ constructor(
             .onSuccess {
                 fileUtils.zipAll(it, files).onFailure(onFailure)
                 fileUtils.exportFile(it, uri, FileUtils.ZIP_FILE_MIME_TYPE).onFailure(onFailure)
+                postSideEffect(
+                    GlobalSideEffect.Snackbar(StringValue.StringResource(R.string.export_success))
+                )
+                clearSelectedTunnels()
             }
             .onFailure(onFailure)
     }