diff --git a/designer/src/com/fr/grid/selection/FloatSelection.java b/designer/src/com/fr/grid/selection/FloatSelection.java
index 0d441a1f7a..cff3a4a642 100644
--- a/designer/src/com/fr/grid/selection/FloatSelection.java
+++ b/designer/src/com/fr/grid/selection/FloatSelection.java
@@ -149,8 +149,9 @@ public class FloatSelection extends Selection {
         TemplateElementCase ec = ePane.getEditingElementCase();
         FloatElement fe = ec.getFloatElement(selectedFloatName);
         if (fe != null) {
-            ec.removeFloatElement(fe);
+            //  REPORT-5955 [Report]删除悬浮元素后，设计器卡死；之前wu做了释放内存，删除悬浮元素会报npe；删除悬浮元素逻辑改为先setSelection 再 remove
             ePane.setSelection(new CellSelection(0, 0, 1, 1));
+            ec.removeFloatElement(fe);
 
             return true;
         }
@@ -240,7 +241,6 @@ public class FloatSelection extends Selection {
     }
 
     public void populateWidgetPropertyPane(ElementCasePane ePane){
-        return;
     }
 
 }
\ No newline at end of file