diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3b63175bd..4ea4df671 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Unreleased
+
+### Fixed
+
+- Fixed the text truncation in buttons of the admin control panel
+
 ## 0.88.0 - 20.04.2021
 
 ### Changed
diff --git a/apps/client/src/app/pages/admin/admin-page.html b/apps/client/src/app/pages/admin/admin-page.html
index 330a9a0e3..141c4fd05 100644
--- a/apps/client/src/app/pages/admin/admin-page.html
+++ b/apps/client/src/app/pages/admin/admin-page.html
@@ -26,9 +26,9 @@
                   >In Progress</ng-container
                 >
               </div>
-              <div class="mt-2">
+              <div class="mt-2 overflow-hidden">
                 <button
-                  class="mb-2 mr-2"
+                  class="mb-2 mr-2 mw-100"
                   color="accent"
                   mat-flat-button
                   (click)="onFlushCache()"
@@ -37,6 +37,7 @@
                   <span i18n>Reset Data Gathering</span>
                 </button>
                 <button
+                  class="mw-100"
                   color="warn"
                   mat-flat-button
                   [disabled]="dataGatheringInProgress"
diff --git a/apps/client/src/app/pages/admin/admin-page.scss b/apps/client/src/app/pages/admin/admin-page.scss
index 5ccd9216e..8313c57f1 100644
--- a/apps/client/src/app/pages/admin/admin-page.scss
+++ b/apps/client/src/app/pages/admin/admin-page.scss
@@ -16,6 +16,18 @@
       }
     }
   }
+
+  .mat-flat-button {
+    ::ng-deep {
+      .mat-button-wrapper {
+        display: block;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        width: 100%;
+      }
+    }
+  }
 }
 
 :host-context(.is-dark-theme) {