diff --git a/guacamole/src/main/webapp/app/client/directives/guacThumbnail.js b/guacamole/src/main/webapp/app/client/directives/guacThumbnail.js
index 06a6c3c4f..99956b769 100644
--- a/guacamole/src/main/webapp/app/client/directives/guacThumbnail.js
+++ b/guacamole/src/main/webapp/app/client/directives/guacThumbnail.js
@@ -189,11 +189,6 @@ angular.module('client').directive('guacThumbnail', [function guacThumbnail() {
 
             });
 
-            // Do not allow nested elements to prevent handling of click events
-            main.addEventListener('click', function preventClickPropagation(e) {
-                e.stopPropagation();
-            }, true);
-
         }]
     };
 }]);
\ No newline at end of file
diff --git a/guacamole/src/main/webapp/app/client/styles/thumbnail-display.css b/guacamole/src/main/webapp/app/client/styles/thumbnail-display.css
index 405ece1d8..868959793 100644
--- a/guacamole/src/main/webapp/app/client/styles/thumbnail-display.css
+++ b/guacamole/src/main/webapp/app/client/styles/thumbnail-display.css
@@ -34,4 +34,5 @@ div.thumbnail-main {
 
 .thumbnail-main .display {
     position: absolute;
+    pointer-events: none;
 }
\ No newline at end of file