diff --git a/web/static/css/graph.css b/web/static/css/graph.css
index 0620364091..927d12bfe1 100644
--- a/web/static/css/graph.css
+++ b/web/static/css/graph.css
@@ -22,6 +22,10 @@ svg {
         margin: 0 0 0 0px;
 }
 
+.graph .detail .x_label.flipped {
+  right: 0;
+}
+
 .graph .detail .item.flipped {
   right: 10px;
 }
diff --git a/web/static/js/graph.js b/web/static/js/graph.js
index a921bd00c4..7c93e8216c 100644
--- a/web/static/js/graph.js
+++ b/web/static/js/graph.js
@@ -382,6 +382,14 @@ Prometheus.Graph.prototype.updateGraph = function(reloadGraph) {
       var width = this.graph.width;
       var element = jQuery(this.element);
 
+      jQuery(".x_label", element).each(function() {
+        if ($(this).outerWidth() + element.offset().left > width) {
+          $(this).addClass("flipped")
+        } else {
+          $(this).removeClass("flipped")
+        }
+      })
+
       jQuery(".item", element).each(function() {
         if ($(this).outerWidth() + element.offset().left > width) {
           $(this).addClass("flipped")