diff --git a/public/app/plugins/datasource/graphite/func_editor.js b/public/app/plugins/datasource/graphite/func_editor.js
index 949a6912720..5648aa4935b 100644
--- a/public/app/plugins/datasource/graphite/func_editor.js
+++ b/public/app/plugins/datasource/graphite/func_editor.js
@@ -43,7 +43,7 @@ function (angular, _, $, rst2html) {
 
             $input.val(func.params[paramIndex]);
 
-            $comma.removeClass('last');
+            $comma.removeClass('query-part__last');
             $link.hide();
             $input.show();
             $input.focus();
@@ -103,10 +103,10 @@ function (angular, _, $, rst2html) {
               ctrl.targetChanged();
             });
 
-            if ($link.hasClass('last') && newValue === '') {
-              $comma.addClass('last');
+            if ($link.hasClass('query-part__last') && newValue === '') {
+              $comma.addClass('query-part__last');
             } else {
-              $link.removeClass('last');
+              $link.removeClass('query-part__last');
             }
 
             $input.hide();
@@ -202,11 +202,11 @@ function (angular, _, $, rst2html) {
               }
 
               if (index > 0) {
-                $('<span class="comma' + (last ? ' last' : '') + '">, </span>').appendTo(elem);
+                $('<span class="comma' + (last ? ' query-part__last' : '') + '">, </span>').appendTo(elem);
               }
 
               var $paramLink = $(
-                '<a ng-click="" class="graphite-func-param-link' + (last ? ' last' : '') + '">'
+                '<a ng-click="" class="graphite-func-param-link' + (last ? ' query-part__last' : '') + '">'
                 + (paramValue || '&nbsp;') + '</a>');
               var $input = $(paramTemplate);
               $input.attr('placeholder', param.name);
diff --git a/public/sass/components/_query_part.scss b/public/sass/components/_query_part.scss
index f029f781fd1..e5ad043788f 100644
--- a/public/sass/components/_query_part.scss
+++ b/public/sass/components/_query_part.scss
@@ -7,11 +7,11 @@
     text-align: center;
   }
 
-  .last {
+  .query-part__last {
     display: none;
   }
 
-  &:hover .last {
+  &:hover .query-part__last {
     display: inline;
   }
 }