diff --git a/resources/assets/javascripts/lib/global_search.js b/resources/assets/javascripts/lib/global_search.js
index 394b7e30a33fecf553fc24a17d5a728e2a8058fb..19154a1b0e8f70f3e7564fb35384ce5f577aa305 100644
--- a/resources/assets/javascripts/lib/global_search.js
+++ b/resources/assets/javascripts/lib/global_search.js
@@ -96,6 +96,10 @@ const GlobalSearch = {
 
                 // Process results and create corresponding entries.
                 $.each(value.content, function(index, result) {
+                    // Which result types should be opened via dialog?
+                    const openInDialog = ['GlobalSearchFiles', 'GlobalSearchMessages'];
+                    var dataDialog = (openInDialog.indexOf(name) >= 0 ? dataDialog = 'data-dialog' : dataDialog = '');
+
                     // Create single result entry.
                     var single = $(`<a href="${result.url}" role="listitem" ${dataDialog}>`),
                         data = $('<div class="globalsearch-result-data">'),
@@ -105,11 +109,6 @@ const GlobalSearch = {
                         single.addClass('globalsearch-extended-result');
                     }
 
-                    // Which result types should be opened via dialog?
-                    const openInDialog = ['GlobalSearchFiles', 'GlobalSearchMessages'];
-                    var dataDialog = (openInDialog.indexOf(name) >= 0 ? dataDialog = 'data-dialog' : dataDialog = '');
-                    //var link = $(`<a href="${result.url}" ${dataDialog}>`).appendTo(single);
-
                     // Optional image...
                     if (result.img !== null) {
                         $(`<img src="${result.img}" alt="">`)
diff --git a/resources/assets/stylesheets/scss/globalsearch.scss b/resources/assets/stylesheets/scss/globalsearch.scss
index ef7c6e652f82da4c3ccc192955470c89829b9a5d..cca121cd8d9bf0c6c3a82ab21cd11d748f7fb58b 100644
--- a/resources/assets/stylesheets/scss/globalsearch.scss
+++ b/resources/assets/stylesheets/scss/globalsearch.scss
@@ -175,6 +175,7 @@
                 display: flex;
                 flex-direction: row;
                 flex-wrap: nowrap;
+                gap: 6px;
 
                 padding: 6px 6px 6px 0;
 
@@ -200,7 +201,6 @@
                 .globalsearch-result-img {
                     flex: 0;
                     margin-left: 6px;
-                    margin-right: 6px;
 
                     img {
                         @include square(36px);
@@ -210,7 +210,6 @@
                 .globalsearch-result-data {
                     flex: 1;
                     overflow: hidden;
-                    margin-right: 6px;
                     white-space: nowrap;
 
                     .globalsearch-result-title {
@@ -235,7 +234,7 @@
                 }
 
                 .globalsearch-result-expand {
-                    flex: auto;
+                    flex: 0;
                     margin: 20px 0 0 -32px;
 
                     a {