diff --git a/build_keyboard.mk b/build_keyboard.mk
index 17e1d08a04..d1d2693fec 100644
--- a/build_keyboard.mk
+++ b/build_keyboard.mk
@@ -12,6 +12,8 @@ endif
 
 .DEFAULT_GOAL := all
 
+TOP_DIR ?= .
+
 include $(TOP_DIR)/common.mk
 
 # Set the filename for the final firmware binary
diff --git a/common.mk b/common.mk
index b12bd9c960..e8b410367e 100644
--- a/common.mk
+++ b/common.mk
@@ -1,6 +1,4 @@
 # Directory common source files exist
-TOP_DIR ?= .
-
 include $(TOP_DIR)/message.mk
 
 TMK_DIR = tmk_core