diff --git a/Tools/Source/PackageEditor/src/org/tianocore/packaging/UpdateGuids.java b/Tools/Source/PackageEditor/src/org/tianocore/packaging/UpdateGuids.java
index 294549c9c1..943a782f4e 100644
--- a/Tools/Source/PackageEditor/src/org/tianocore/packaging/UpdateGuids.java
+++ b/Tools/Source/PackageEditor/src/org/tianocore/packaging/UpdateGuids.java
@@ -155,6 +155,9 @@ public class UpdateGuids extends JFrame implements ActionListener {
      Remove original GUID declarations before saving updated ones
     **/
     protected void save() {
+        if (jTable.isEditing()) {
+            jTable.getCellEditor().stopCellEditing();
+        }
         sfc.removeSpdGuidDeclaration();
         int rowCount = model.getRowCount();
         int i = 0;