diff --git a/Gruntfile.js b/Gruntfile.js
index 025733b..fd3051f 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -33,7 +33,7 @@ module.exports = function(grunt) {
     watch: {
       rebuild_all: {
         files: ['src/**/*', 'plugin.json'],
-        tasks: ['default'],
+        tasks: ['watchTask'],
         options: {spawn: false}
       },
     },
@@ -135,4 +135,14 @@ module.exports = function(grunt) {
     'babel',
     'mochaTest'
   ]);
+
+  grunt.registerTask('watchTask', [
+    'clean',
+    'copy:src_to_dist',
+    'copy:pluginDef',
+    'jshint',
+    'jscs',
+    'sass',
+    'babel:dist'
+  ]);
 };