diff --git a/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp b/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp
index ca45924e7a..504b92152f 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp
@@ -875,6 +875,10 @@ void GLGizmoEmboss::on_set_state()
     }
 }
 
+void GLGizmoEmboss::data_changed() { 
+    set_volume(priv::get_selected_volume(m_parent.get_selection()));
+}
+
 void GLGizmoEmboss::on_start_dragging() { m_rotate_gizmo.start_dragging(); }
 void GLGizmoEmboss::on_stop_dragging()
 {
@@ -1133,10 +1137,6 @@ bool GLGizmoEmboss::set_volume(ModelVolume *volume)
     m_text   = tc.text;
     m_volume = volume;
 
-    // store volume state before edit
-    m_unmodified_volume = {*volume->get_mesh_shared_ptr(), // copy
-                           tc, volume->get_matrix(), volume->name};
-
     // calculate scale for height and depth inside of scaled object instance
     calculate_scale();
     return true;
@@ -1313,34 +1313,12 @@ void GLGizmoEmboss::close()
         }
     }
 
-    // prepare for new opening
-    m_unmodified_volume.reset();
-
     // close gizmo == open it again
     auto& mng = m_parent.get_gizmos_manager();
     if (mng.get_current_type() == GLGizmosManager::Emboss)
         mng.open_gizmo(GLGizmosManager::Emboss);
 }
 
-void GLGizmoEmboss::discard_and_close() { 
-    if (!m_unmodified_volume.has_value()) return;    
-    m_volume->set_transformation(m_unmodified_volume->tr);
-    UpdateJob::update_volume(m_volume, std::move(m_unmodified_volume->tm), m_unmodified_volume->tc, m_unmodified_volume->name);
-    close();    
-
-    //auto plater = wxGetApp().plater();
-    // 2 .. on set state off, history is squashed into 'emboss_begin' and 'emboss_end'
-    //plater->undo_to(2); // undo before open emboss gizmo
-    // TODO: need fix after move to find correct undo timestamp or different approach
-    // It is weird ford user that after discard changes it is moving with history
-
-    // NOTE: Option to remember state before edit:
-    //  * Need triangle mesh(memory consuming), volume name, transformation + TextConfiguration
-    //  * Can't revert volume id.
-    //  * Need to refresh a lot of stored data. More info in implementation EmbossJob.cpp -> update_volume()
-    //  * Volume containing 3mf fix transformation - needs work around
-}
-
 namespace priv {
 
 /// <summary>
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoEmboss.hpp b/src/slic3r/GUI/Gizmos/GLGizmoEmboss.hpp
index 2fabf0566f..f8e1bacb99 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoEmboss.hpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoEmboss.hpp
@@ -62,7 +62,7 @@ protected:
     bool on_is_activable() const override { return true; }
     bool on_is_selectable() const override { return false; }
     void on_set_state() override;    
-    
+    void data_changed() override; // selection changed
     void on_set_hover_id() override{ m_rotate_gizmo.set_hover_id(m_hover_id); }
     void on_enable_grabber(unsigned int id) override { m_rotate_gizmo.enable_grabber(); }
     void on_disable_grabber(unsigned int id) override { m_rotate_gizmo.disable_grabber(); }
@@ -94,7 +94,6 @@ private:
     // create volume from text - main functionality
     bool process();
     void close();
-    void discard_and_close();
     void draw_window();
     void draw_text_input();
     void draw_model_type();
@@ -285,16 +284,6 @@ private:
     // actual volume
     ModelVolume *m_volume;
 
-    // state of volume when open EmbossGizmo
-    struct EmbossVolume
-    {
-        TriangleMesh tm;
-        TextConfiguration tc;
-        Transform3d tr;
-        std::string name;
-    };
-    std::optional<EmbossVolume> m_unmodified_volume;
-
     // True when m_text contain character unknown by selected font
     bool m_text_contain_unknown_glyph = false;