diff --git a/CHANGELOG b/CHANGELOG
index 83a5d1727f33ad65ea9adfabdda931551ba15f0e..92dd5d44f0809f5ea856ffefd2d829ddd907f5b8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -36,6 +36,7 @@ v 8.12.0 (unreleased)
   - Capitalize mentioned issue timeline notes (ClemMakesApps)
   - Use the default branch for displaying the project icon instead of master !5792 (Hannes Rosenögger)
   - Adds response mime type to transaction metric action when it's not HTML
+  - Fix hover leading space bug in pipeline graph !5980
 
 v 8.11.3 (unreleased)
   - Allow system info page to handle case where info is unavailable
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index 743fe89a9f4bf8d848668354a91465864de43935..0dcf61dd2ddd82b2fcf31257613d3be60fb0c903 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -319,6 +319,14 @@
 
       a {
         color: $layout-link-gray;
+        text-decoration: none;
+
+        &:hover {
+          .ci-status-text {
+            text-decoration: underline;
+          }
+        }
+
       }
     }
 
diff --git a/app/views/projects/ci/builds/_build_pipeline.html.haml b/app/views/projects/ci/builds/_build_pipeline.html.haml
index ebdf60ae3707c5443b532083073939fbafab9e5a..36fb0300aebc7a554d938d0170795957ea72726b 100644
--- a/app/views/projects/ci/builds/_build_pipeline.html.haml
+++ b/app/views/projects/ci/builds/_build_pipeline.html.haml
@@ -5,11 +5,11 @@
     - if is_playable
       = link_to play_namespace_project_build_path(subject.project.namespace, subject.project, subject, return_to: request.original_url), method: :post, title: 'Play' do
         = render_status_with_link('build', 'play')
-        = subject.name
+        %span.ci-status-text= subject.name
     - elsif can?(current_user, :read_build, @project)
       = link_to namespace_project_build_path(subject.project.namespace, subject.project, subject) do
         = render_status_with_link('build', subject.status)
-        = subject.name
+        %span.ci-status-text= subject.name
     - else
       = render_status_with_link('build', subject.status)
       = ci_icon_for_status(subject.status)
diff --git a/app/views/projects/generic_commit_statuses/_generic_commit_status_pipeline.html.haml b/app/views/projects/generic_commit_statuses/_generic_commit_status_pipeline.html.haml
index 584c0fa18ae4eb8468980d7a7a19d3ac302cb4d2..31d40f6ad032b6100a87054cb8bacf7add03a89e 100644
--- a/app/views/projects/generic_commit_statuses/_generic_commit_status_pipeline.html.haml
+++ b/app/views/projects/generic_commit_statuses/_generic_commit_status_pipeline.html.haml
@@ -3,7 +3,7 @@
     - if subject.target_url
       - link_to subject.target_url do
         = render_status_with_link('commit status', subject.status)
-        = subject.name
+        %span.ci-status-text= subject.name
     - else
       = render_status_with_link('commit status', subject.status)
-      = subject.name
+      %span.ci-status-text= subject.name