diff --git a/CHANGELOG b/CHANGELOG
index c1b48d6f93..4095ed5ff9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -22,6 +22,7 @@ v 8.9.1 (unreleased)
   - Hide nav arrows by default. !4843
   - Added bottom padding to label color suggestion link. !4845
   - Fix GitLab project import issues related to notes and builds. !4855
+  - Restrict header logo to 36px so it doesn't overflow. !4861
 
 v 8.9.0
   - Fix builds API response not including commit data
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index a7bcb45656..e8cbe7f3c0 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -132,6 +132,10 @@ header {
       transition-duration: .3s;
       z-index: 999;
 
+      svg, img {
+        height: 36px;
+      }
+
       &:hover {
         cursor: pointer;
       }