diff --git a/src/main/webapp/js/components/widgets/Widget.js b/src/main/webapp/js/components/widgets/Widget.js
index d5f2f4176..361025a12 100644
--- a/src/main/webapp/js/components/widgets/Widget.js
+++ b/src/main/webapp/js/components/widgets/Widget.js
@@ -660,6 +660,7 @@ define(function (require) {
                         top: 10,
                         height: 300,
                         width: 350,
+                        closeOnEscape: false,
                         close: function (event, ui) {
                             if (event.originalEvent &&
                                 $(event.originalEvent.target).closest(".ui-dialog-titlebar-close").length) {
diff --git a/src/main/webapp/js/components/widgets/WidgetCapability.js b/src/main/webapp/js/components/widgets/WidgetCapability.js
index fc6184a65..fbacfa344 100644
--- a/src/main/webapp/js/components/widgets/WidgetCapability.js
+++ b/src/main/webapp/js/components/widgets/WidgetCapability.js
@@ -544,6 +544,7 @@ define(function (require) {
                             top: 10,
                             height: this.props.size.height,
                             width: this.props.size.width,
+                            closeOnEscape: false,
                             position: {
                                 my: "left+" + this.props.position.left + " top+" + this.props.position.top,
                                 at: "left top",
diff --git a/src/main/webapp/js/components/widgets/plot/Plot.js b/src/main/webapp/js/components/widgets/plot/Plot.js
index 07473ae12..7ed43582e 100644
--- a/src/main/webapp/js/components/widgets/plot/Plot.js
+++ b/src/main/webapp/js/components/widgets/plot/Plot.js
@@ -12,6 +12,11 @@ define(function (require) {
 	var $ = require('jquery');
 	var math = require('mathjs');
 	var Plotly = require('plotly.js/lib/core');
+
+	Plotly.register([
+		require('plotly.js/lib/heatmap'),
+	]);
+
 	
 	var FileSaver = require('file-saver');
 	var pako = require('pako');