diff --git a/app/javascript/flavours/glitch/features/compose/components/search_results.js b/app/javascript/flavours/glitch/features/compose/components/search_results.js
index 5c443980e..893b0b4e7 100644
--- a/app/javascript/flavours/glitch/features/compose/components/search_results.js
+++ b/app/javascript/flavours/glitch/features/compose/components/search_results.js
@@ -84,7 +84,9 @@ class SearchResults extends ImmutablePureComponent {
         <section>
           <h5><Icon icon='hashtag' fixedWidth /><FormattedMessage id='search_results.hashtags' defaultMessage='Hashtags' /></h5>
 
-          {results.get('hashtags').map(hashtag => <Hashtag key={hashtag.get('name')} hashtag={hashtag} />)}
+          <div className='hashtags'>
+            {results.get('hashtags').map(hashtag => <Hashtag key={hashtag.get('name')} hashtag={hashtag} />)}
+          </div>
         </section>
       );
     }
diff --git a/app/javascript/flavours/glitch/styles/components/drawer.scss b/app/javascript/flavours/glitch/styles/components/drawer.scss
index 5ad78e0b6..b05f231f2 100644
--- a/app/javascript/flavours/glitch/styles/components/drawer.scss
+++ b/app/javascript/flavours/glitch/styles/components/drawer.scss
@@ -228,7 +228,11 @@
       border-bottom: 0;
     }
 
-    & > .hashtag {
+    & > .hashtags {
+      text-align: center;
+    }
+
+    & > div > .hashtag {
       display: inline-block;
       padding: 10px;
       color: $secondary-text-color;