diff --git a/designer/src/com/fr/design/mainframe/HyperlinkGroupPaneActionImpl.java b/designer/src/com/fr/design/mainframe/HyperlinkGroupPaneActionImpl.java
index 6343deabf..92ca0617e 100644
--- a/designer/src/com/fr/design/mainframe/HyperlinkGroupPaneActionImpl.java
+++ b/designer/src/com/fr/design/mainframe/HyperlinkGroupPaneActionImpl.java
@@ -87,5 +87,7 @@ public class HyperlinkGroupPaneActionImpl implements HyperlinkGroupPaneActionPro
                 }
             });
         }
+
+        HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().fireTargetModified();
     }
 }
diff --git a/designer_form/src/com/fr/design/mainframe/JForm.java b/designer_form/src/com/fr/design/mainframe/JForm.java
index cde441c89..56e3c5d87 100644
--- a/designer_form/src/com/fr/design/mainframe/JForm.java
+++ b/designer_form/src/com/fr/design/mainframe/JForm.java
@@ -96,6 +96,9 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm {
 
     @Override
     public TargetComponent getCurrentElementCasePane() {
+        if (elementCaseDesign == null) {
+            return null;
+        }
         return elementCaseDesign.getEditingElementCasePane();
     }