diff --git a/lib/classes/sidebar/ClipboardWidget.class.php b/lib/classes/sidebar/ClipboardWidget.class.php
index f09615e33c6bca4580fd882cc876ccf3a6e64e36..376e47e37c43d4b3a3022d144b02689816510ab3 100644
--- a/lib/classes/sidebar/ClipboardWidget.class.php
+++ b/lib/classes/sidebar/ClipboardWidget.class.php
@@ -80,7 +80,7 @@ class ClipboardWidget extends SidebarWidget
         }
 
         $this->setId("ClipboardWidget_{$this->clipboard_widget_id}");
-        $this->setAdditionalAttribute('data-widget_id', $this->getId());
+        $this->setAdditionalAttribute('data-widget_id', $this->clipboard_widget_id);
         $this->addLayoutCSSClass('clipboard-widget');
     }
 
diff --git a/templates/sidebar/room-clipboard-widget.php b/templates/sidebar/room-clipboard-widget.php
index dfd2a01571267c86af40235313bdc85a0be566a2..ca584436ca11941893f4f9efca986f1a76d9ad4d 100644
--- a/templates/sidebar/room-clipboard-widget.php
+++ b/templates/sidebar/room-clipboard-widget.php
@@ -12,7 +12,6 @@
         ]
         ); ?>
 
-<? if (!$readonly): ?>
     <ul class="widget-list widget-links invisible">
     <? foreach ($elements as $index => $element): ?>
         <li id="<?= htmlReady('link-' . md5($element->url)) ?>" <?= $element->icon ? 'style="' . $element->icon->asCSS() .'"' : '' ?>>
@@ -23,6 +22,8 @@
         </li>
     <? endforeach; ?>
     </ul>
+</div>
+<? if (!$readonly): ?>
     <form class="default new-clipboard-form"
           action="<?= URLHelper::getLink(
                   'dispatch.php/clipboard/add'
@@ -49,4 +50,3 @@
 
     </form>
 <? endif ?>
-</div>