diff --git a/src/libslic3r/GCode/GCodeProcessor.cpp b/src/libslic3r/GCode/GCodeProcessor.cpp
index ef9c64880..ae414ad44 100644
--- a/src/libslic3r/GCode/GCodeProcessor.cpp
+++ b/src/libslic3r/GCode/GCodeProcessor.cpp
@@ -346,6 +346,18 @@ void GCodeProcessor::apply_config(const PrintConfig& config)
     }
 }
 
+void GCodeProcessor::apply_config(const DynamicPrintConfig& config)
+{
+    m_parser.apply_config(config);
+
+    const ConfigOptionFloats* filament_diameters = config.option<ConfigOptionFloats>("filament_diameter");
+    if (filament_diameters != nullptr) {
+        for (double diam : filament_diameters->values) {
+            m_filament_diameters.push_back(static_cast<float>(diam));
+        }
+    }
+}
+
 void GCodeProcessor::enable_stealth_time_estimator(bool enabled)
 {
     m_time_processor.machines[static_cast<size_t>(ETimeMode::Stealth)].enabled = enabled;
@@ -391,6 +403,28 @@ void GCodeProcessor::process_file(const std::string& filename)
     auto start_time = std::chrono::high_resolution_clock::now();
 #endif // ENABLE_GCODE_VIEWER_STATISTICS
 
+    // pre-processing
+    // parse the gcode file to detect its producer
+    if (m_producers_enabled) {
+        m_parser.parse_file(filename, [this](GCodeReader& reader, const GCodeReader::GCodeLine& line) {
+            std::string cmd = line.cmd();
+            if (cmd.length() == 0) {
+                std::string comment = line.comment();
+                if (comment.length() > 1 && detect_producer(comment))
+                    m_parser.quit_parsing_file();
+            }
+            });
+
+        // if the gcode was produced by PrusaSlicer,
+        // extract the config from it
+        if (m_producer == EProducer::PrusaSlicer) {
+            DynamicPrintConfig config;
+            config.apply(FullPrintConfig::defaults());
+            config.load_from_gcode_file(filename);
+            apply_config(config);
+        }
+    }
+
     m_result.id = ++s_result_id;
     m_result.moves.emplace_back(MoveVertex());
     m_parser.parse_file(filename, [this](GCodeReader& reader, const GCodeReader::GCodeLine& line) { process_gcode_line(line); });
@@ -554,11 +588,12 @@ void GCodeProcessor::process_gcode_line(const GCodeReader::GCodeLine& line)
 
 void GCodeProcessor::process_tags(const std::string& comment)
 {
-    if (m_producers_enabled && m_producer == EProducer::Unknown && detect_producer(comment))
-        return;
-    else if (m_producers_enabled && m_producer != EProducer::Unknown) {
-        if (process_producers_tags(comment))
-            return;
+    // producers tags
+    if (m_producers_enabled) {
+        if (m_producer != EProducer::Unknown) {
+            if (process_producers_tags(comment))
+                return;
+        }
     }
 
     // extrusion role tag
diff --git a/src/libslic3r/GCode/GCodeProcessor.hpp b/src/libslic3r/GCode/GCodeProcessor.hpp
index d59fc7bb9..b2d702f7f 100644
--- a/src/libslic3r/GCode/GCodeProcessor.hpp
+++ b/src/libslic3r/GCode/GCodeProcessor.hpp
@@ -266,6 +266,7 @@ namespace Slic3r {
         GCodeProcessor() { reset(); }
 
         void apply_config(const PrintConfig& config);
+        void apply_config(const DynamicPrintConfig& config);
         void enable_stealth_time_estimator(bool enabled);
         void enable_producers(bool enabled) { m_producers_enabled = enabled; }
         void reset();
diff --git a/src/libslic3r/GCodeReader.cpp b/src/libslic3r/GCodeReader.cpp
index e68bc5ad2..ab77b0141 100644
--- a/src/libslic3r/GCodeReader.cpp
+++ b/src/libslic3r/GCodeReader.cpp
@@ -115,7 +115,12 @@ void GCodeReader::parse_file(const std::string &file, callback_t callback)
 {
     std::ifstream f(file);
     std::string line;
+#if ENABLE_GCODE_VIEWER
+    m_parsing_file = true;
+    while (m_parsing_file && std::getline(f, line))
+#else
     while (std::getline(f, line))
+#endif // ENABLE_GCODE_VIEWER
         this->parse_line(line, callback);
 }
 
diff --git a/src/libslic3r/GCodeReader.hpp b/src/libslic3r/GCodeReader.hpp
index 9503ddcc1..7e0793cd9 100644
--- a/src/libslic3r/GCodeReader.hpp
+++ b/src/libslic3r/GCodeReader.hpp
@@ -107,6 +107,9 @@ public:
         { GCodeLine gline; this->parse_line(line.c_str(), gline, callback); }
 
     void parse_file(const std::string &file, callback_t callback);
+#if ENABLE_GCODE_VIEWER
+    void quit_parsing_file() { m_parsing_file = false; }
+#endif // ENABLE_GCODE_VIEWER
 
     float& x()       { return m_position[X]; }
     float  x() const { return m_position[X]; }
@@ -145,6 +148,9 @@ private:
     char        m_extrusion_axis;
     float       m_position[NUM_AXES];
     bool        m_verbose;
+#if ENABLE_GCODE_VIEWER
+    bool        m_parsing_file{ false };
+#endif // ENABLE_GCODE_VIEWER
 };
 
 } /* namespace Slic3r */