diff --git a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-ui/src/main/resources/XWiki/AttachmentSelector.xml b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-ui/src/main/resources/XWiki/AttachmentSelector.xml
index 75909149303c..675c00e63a7d 100644
--- a/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-ui/src/main/resources/XWiki/AttachmentSelector.xml
+++ b/xwiki-platform-core/xwiki-platform-attachment/xwiki-platform-attachment-ui/src/main/resources/XWiki/AttachmentSelector.xml
@@ -789,7 +789,13 @@ $xwiki.jsx.use($attachmentPickerDocName)
     $$('.attachment-picker-start').invoke('observe', 'click', function(event) {
       event.stop();
       var targetElement = event.element();
-      var url = targetElement.href;
+      let url = null;
+      if (targetElement.tagName === "a") {
+        url = targetElement.href;
+      }
+      else {
+        url = targetElement.dataset.modalUrl;
+      }
       if (url.indexOf('?') < 0) {
         url += '?';
       }
@@ -1611,9 +1617,15 @@ $xwiki.ssx.use($xcontext.macro.doc.fullName)##
     #if ($hasTargetDoc)
       #set ($queryString.targetdocname = $targetdoc.fullName)
     #end
-    #set ($linkLabel = $services.rendering.escape($services.rendering.escape($buttontext, 'xwiki/2.1'), 'xwiki/2.1'))
-    (% class="buttonwrapper" %)[[$linkLabel>>${xcontext.macro.doc.fullName}||queryString="$escapetool.url($queryString)"
-      class="attachment-picker-start button" title="$services.rendering.escape($buttontext, 'xwiki/2.1')"]](%%)##
+    #set ($linkLabel = $escapetool.xml($buttontext))
+    #set ($modalUrl = $escapetool.xml("$xcontext.macro.doc.URL?$escapetool.url($queryString)"))
+    (% class="buttonwrapper" %)##
+      {{html clean="false"}}
+        <button class="attachment-picker-start button" 
+        title="$!{linkLabel}" 
+        data-modal-url="${modalUrl}">$!linkLabel
+        </button>
+      {{/html}}(%%)##
   #end
 #end
 {{/velocity}}
diff --git a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-profile/xwiki-platform-user-profile-ui/src/main/resources/XWiki/XWikiUserSheet.xml b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-profile/xwiki-platform-user-profile-ui/src/main/resources/XWiki/XWikiUserSheet.xml
index 2b5b1be684fb..fe335769f5f6 100644
--- a/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-profile/xwiki-platform-user-profile-ui/src/main/resources/XWiki/XWikiUserSheet.xml
+++ b/xwiki-platform-core/xwiki-platform-user/xwiki-platform-user-profile/xwiki-platform-user-profile-ui/src/main/resources/XWiki/XWikiUserSheet.xml
@@ -666,12 +666,10 @@ span#avatarUpload {
 
 #user-menu-col .attachment-picker {
   .buttonwrapper {
-    .wikilink {
-      display: flex;
-      flex-flow: column;
-    }
+    display: flex;
+    flex-flow: column;
 
-    a.button {
+    .button {
       .btn;
       .btn-default;
       border-radius: 0 0 @border-radius-base @border-radius-base;