diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/preview/sql/PreviewPerformedSqlPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/preview/sql/PreviewPerformedSqlPane.java
index d86b6ad6c..8ddf261cf 100644
--- a/designer-base/src/main/java/com/fr/design/data/datapane/preview/sql/PreviewPerformedSqlPane.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/preview/sql/PreviewPerformedSqlPane.java
@@ -48,6 +48,8 @@ import java.awt.Frame;
 import java.awt.datatransfer.StringSelection;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -146,6 +148,12 @@ public class PreviewPerformedSqlPane extends JDialog implements ActionListener {
         this.add(centerPanel, BorderLayout.CENTER);
         this.add(bottomPanel, BorderLayout.SOUTH);
         this.setSize(600, 400);
+        this.addWindowListener(new WindowAdapter() {
+            @Override
+            public void windowClosing(WindowEvent e) {
+                close();
+            }
+        });
 
         GUICoreUtils.centerWindow(this);
     }
@@ -272,4 +280,8 @@ public class PreviewPerformedSqlPane extends JDialog implements ActionListener {
     public void actionPerformed(ActionEvent e) {
         this.dispose();
     }
+
+    private void close() {
+        this.dispose();
+    }
 }