diff --git a/ChangeLog b/ChangeLog
index f0a96e0ca267a92fd2556da0d4a20ff566840185..0500856d9ee662cc1b1b4d8effaa0aa020373e9f 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-10-20  Steffen Gebert  <steffen@steffen-gebert.de>
+
+	* Fixed bug #16049: Loading mask doesn't disappear on hitting Esc/cancel loading
+
 2010-10-19  Stanislas Rolland  <typo3@sjbr.ca>
 
 	* Added feature #16073: htmlArea RTE: Add paste as plain text feature
diff --git a/typo3/js/extjs/iframepanel.js b/typo3/js/extjs/iframepanel.js
index 0277f0d798d50d00d53864e1d22499f5742afc6b..40d0e9192f964243cdac12e6c8e9558ebcaf42c0 100644
--- a/typo3/js/extjs/iframepanel.js
+++ b/typo3/js/extjs/iframepanel.js
@@ -100,8 +100,18 @@ TYPO3.iframePanel = Ext.extend(Ext.Panel, {
 		if (this.doMask) {
 			this.el.mask(this.maskMessage, 'x-mask-loading-message');
 			this.el.addClass('t3-mask-loading');
+				// add an onClick handler to remove the mask while clicking on the loading message
+				// useful if user cancels loading and wants to access the content again
+			this.el.child('.x-mask-loading-message').on(
+				'click',
+				function() {
+					this.el.unmask();
+				},
+				this
+			);
 		}
 	},
+
 	removeMask: function() {
 		if (this.doMask) {
 			this.el.unmask();
diff --git a/typo3/sysext/t3skin/extjs/xtheme-t3skin.css b/typo3/sysext/t3skin/extjs/xtheme-t3skin.css
index 1bb7e3e0d36690a77f870060e739cc42ebaf4f6c..a41ff5511b6f6700555231b74788e8f1fe7c067d 100644
--- a/typo3/sysext/t3skin/extjs/xtheme-t3skin.css
+++ b/typo3/sysext/t3skin/extjs/xtheme-t3skin.css
@@ -512,6 +512,7 @@ body.x-body-masked .x-window-mc, body.x-body-masked .x-window-plain .x-window-mc
 	background-color: transparent;
 	background-image: url("../images/spinner/big-f0f0f0.gif");
 	border: none;
+	cursor: pointer;
 	height: 32px;
 	padding: 0;
 	width: 32px;