diff --git a/plugins-dev/s57/src/java/pt/lsts/neptus/plugins/s57/S57Chart.java b/plugins-dev/s57/src/java/pt/lsts/neptus/plugins/s57/S57Chart.java
index 1dc69427d8..8fd9d22129 100644
--- a/plugins-dev/s57/src/java/pt/lsts/neptus/plugins/s57/S57Chart.java
+++ b/plugins-dev/s57/src/java/pt/lsts/neptus/plugins/s57/S57Chart.java
@@ -46,6 +46,7 @@
 import pt.lsts.neptus.renderer2d.StateRenderer2D;
 import pt.lsts.neptus.renderer2d.tiles.MapPainterProvider;
 import pt.lsts.neptus.types.coord.LocationType;
+import pt.lsts.neptus.util.GuiUtils;
 import pt.lsts.neptus.util.conf.ConfigFetch;
 import pt.lsts.neptus.util.coord.MapTileUtil;
 import pt.lsts.s57.S57;
@@ -124,6 +125,7 @@ public void dispose() {
             painterList.put(renderer, NeptusS57Painter.forge(s57, mc));
         }
 
+        GuiUtils.reactEscapeKeyPress(dialog);
         return dialog;
     }