diff --git a/Common/make/ghdl.mk b/Common/make/ghdl.mk
index a73ca10..8e49303 100644
--- a/Common/make/ghdl.mk
+++ b/Common/make/ghdl.mk
@@ -25,7 +25,7 @@ run: analyze
 	-$(GHDL) -r --work=$(NAME) --workdir=$(BUILD_DIR) --time-resolution=$(TS) $(ENTITY_RUN) $(RUN_OPTS) >$(BUILD_DIR)/$(NAME).log
 	
 sim: run
-	exec gtkwave -f $(BUILD_DIR)/$(NAME).vcd &
+	exec gtkwave -f $(BUILD_DIR)/$(NAME).ghw -a $(BUILD_DIR)/$(NAME).gtkw &
 	
 synth: analyze
 	$(GHDL) --synth --work=$(NAME) --workdir=$(BUILD_DIR) $(ENTITY_SYN)