diff --git a/client/gulpfile.js b/client/gulpfile.js
index a3c8003ae5a..b64e46748b6 100644
--- a/client/gulpfile.js
+++ b/client/gulpfile.js
@@ -112,4 +112,8 @@ gulp.task("watch", function() {
     gulp.watch(paths.scripts, ["scripts"]);
 });
 
+gulp.task("watch-style", function() {
+    gulp.watch(paths.style, ["style"]);
+});
+
 gulp.task("default", ["scripts", "libs"]);
diff --git a/client/package.json b/client/package.json
index 98697407894..481073c05be 100644
--- a/client/package.json
+++ b/client/package.json
@@ -43,8 +43,8 @@
     "webpack-watch": "webpack -d --watch",
     "webpack-production": "webpack -p",
     "webpack-production-maps": "GXY_BUILD_SOURCEMAPS=1 webpack -p",
-    "style": "grunt style",
-    "style-watch": "grunt watch-style",
+    "style": "grunt && gulp style",
+    "style-watch": "grunt && gulp watch-style",
     "test": "GALAXY_TEST_AS_SINGLE_PACK=true karma start --verbose --single-run --browsers PhantomJS karma.config.js",
     "test-watch": "GALAXY_TEST_AS_SINGLE_PACK=true karma start --verbose --browsers PhantomJS karma.config.js",
     "gulp": "gulp",