diff --git a/plugins/official_products_support/off2pro/module_off2pro.cpp b/plugins/official_products_support/off2pro/module_off2pro.cpp
index 686392435..6f3d30333 100644
--- a/plugins/official_products_support/off2pro/module_off2pro.cpp
+++ b/plugins/official_products_support/off2pro/module_off2pro.cpp
@@ -121,7 +121,7 @@ namespace off2pro
                 logger->error("Unknown File Type!");
         }
 
-        if (std::filesystem::exists(pro_output_file + "/product.cbor") || product_paths.size() > 0)
+        if (/*std::filesystem::exists(pro_output_file + "/product.cbor") ||*/ product_paths.size() > 0)
         {
             // Products dataset
             satdump::products::DataSet dataset;
@@ -132,6 +132,11 @@ namespace off2pro
             else
                 dataset.products_list = product_paths;
             dataset.save(d_output_file_hint.substr(0, d_output_file_hint.rfind('/')));
+            d_output_file = pro_output_file + "/dataset.json";
+        }
+        else if (std::filesystem::exists(pro_output_file + "/product.cbor"))
+        {
+            d_output_file = pro_output_file + "/product.cbor";
         }
     }
 
diff --git a/src-interface/explorer/processing/processing.cpp b/src-interface/explorer/processing/processing.cpp
index 0f2d42102..aaad9f2b6 100644
--- a/src-interface/explorer/processing/processing.cpp
+++ b/src-interface/explorer/processing/processing.cpp
@@ -4,6 +4,7 @@
 #include "imgui/imgui_internal.h"
 #include "logger.h"
 #include "main_ui.h"
+#include <filesystem>
 #include <thread>
 
 namespace satdump
@@ -80,6 +81,11 @@ namespace satdump
                     logger->info("Opening explorer!");
                     explorer_app->tryOpenFileInExplorer(output_file + "/dataset.json"); // TODOREWORK Maybe just try to open the final file produced?
                 }
+                else if (std::filesystem::exists(final_file))
+                {
+                    logger->info("Opening explorer!");
+                    explorer_app->tryOpenFileInExplorer(final_file); // TODOREWORK Maybe just try to open the final file produced?
+                }
             }
 
             pipeline_name = "PROCESSING_DONE"; // TODOREWORK MASSIVE HACK!