diff --git a/designer/src/com/fr/design/actions/edit/EditFloatElementNameAction.java b/designer/src/com/fr/design/actions/edit/EditFloatElementNameAction.java
index 6f235307e1..15a0b07d18 100644
--- a/designer/src/com/fr/design/actions/edit/EditFloatElementNameAction.java
+++ b/designer/src/com/fr/design/actions/edit/EditFloatElementNameAction.java
@@ -39,7 +39,7 @@ public class EditFloatElementNameAction extends FloatSelectionAction {
 				if (report.getFloatElement(name) == null) {
 					selectedFloatElement.setName(name);
 				}
-				reportPane.setSelection(new FloatSelection(name));
+				((FloatSelection) reportPane.getSelection()).setFloatName(name);
 			}                
         });
         nameDialog.setVisible(true);
diff --git a/designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java b/designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java
index 8d25463ab8..cc57b7a852 100644
--- a/designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java
+++ b/designer/src/com/fr/design/mainframe/ElementCasePaneDelegate.java
@@ -75,9 +75,7 @@ public class ElementCasePaneDelegate extends ElementCasePane<WorkSheet> {
             EastRegionContainerPane.getInstance().replaceConfiguredRolesPane(RolesAlreadyEditedPane.getInstance());
             return;
         }
-        if (DesignerContext.getDesignerFrame().getSelectedJTemplate() != null) {
-            CellWidgetPropertyPane.getInstance().populate(ElementCasePaneDelegate.this);
-        }
+        CellWidgetPropertyPane.getInstance().populate(ElementCasePaneDelegate.this);
         CellElementPropertyPane.getInstance().populate(ElementCasePaneDelegate.this);
         QuickEditorRegion.getInstance().populate(getCurrentEditor());
         JTemplate editingTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
diff --git a/designer/src/com/fr/design/widget/WidgetEventPane.java b/designer/src/com/fr/design/widget/WidgetEventPane.java
index f1342f9dea..f1139210cb 100644
--- a/designer/src/com/fr/design/widget/WidgetEventPane.java
+++ b/designer/src/com/fr/design/widget/WidgetEventPane.java
@@ -91,7 +91,7 @@ public class WidgetEventPane extends ObjectUIControlPane {
 
 				@Override
 				protected DBManipulationPane createDBManipulationPane() {
-					if(epane == null) {
+					if(epane == null && DesignerContext.getDesignerFrame().getSelectedJTemplate() != null) {
 						return autoCreateDBManipulationInWidgetEventPane();
 					}