diff --git a/Makefile b/Makefile
index bb8f687c1..15bc4988a 100644
--- a/Makefile
+++ b/Makefile
@@ -149,14 +149,18 @@ css/%.min.css:: css/%.css
 	make dev
 	$(CLEANCSS) $< > $@
 
-.PHONY: watch
-watch: dev
+.PHONY: watchcss
+watchcss: dev
 	$(SASS) --watch -I $(BOURBON) -I $(BOOTSTRAP) sass:css
 
 .PHONY: watchjs
 watchjs: dev
 	./node_modules/.bin/npx  webpack --mode=development  --watch
 
+.PHONY: watch
+watch: dev
+	make -j 2 watchjs watchcss
+
 .PHONY: logo
 logo: logo/conversejs-transparent16.png \
       logo/conversejs-transparent19.png \