diff --git a/plugins/qrcode/qrcode.html b/plugins/qrcode/qrcode.html
index a21f79328..778397173 100644
--- a/plugins/qrcode/qrcode.html
+++ b/plugins/qrcode/qrcode.html
@@ -1,5 +1,3 @@
 <div class="linkqrcode">
-    <a href="#" onclick="showQrCode(this); return false;" class="qrcode" data-permalink="%s">
-        <img src="%s/qrcode/qrcode.png" class="linklist-plugin-icon" title="QR-Code" alt="QRCode">
-    </a>
+    <img data-permalink="%s" src="%s/qrcode/qrcode.png" class="linklist-plugin-icon qrcode" title="QR-Code" alt="QRCode">
 </div>
diff --git a/plugins/qrcode/shaarli-qrcode.js b/plugins/qrcode/shaarli-qrcode.js
index 3316d6f63..0976564ca 100644
--- a/plugins/qrcode/shaarli-qrcode.js
+++ b/plugins/qrcode/shaarli-qrcode.js
@@ -51,7 +51,11 @@ function showQrCode(caller,loading)
     element.id = 'permalinkQrcode';
 
 	// Make QR-Code div commit sepuku when clicked:
-    if ( element.attachEvent ){
+    if (element.addEventListener) {
+        element.addEventListener('click', function() {
+            this.parentNode.removeChild(this);
+        });
+    } else if (element.attachEvent) {
         element.attachEvent('onclick', 'this.parentNode.removeChild(this);' );
 
     } else {
@@ -89,3 +93,18 @@ function removeQrcode()
     }
     return false;
 }
+
+// Create "click" event listeners for QR-Code display action
+function setQrCodeClickEvent()
+{
+    const qrcode_collec = document.getElementsByClassName("qrcode");
+
+    Array.from(qrcode_collec).forEach(function(element) {
+        element.addEventListener('click', function() {
+            showQrCode(this);
+            return false;
+        });
+    });
+}
+
+setQrCodeClickEvent();