diff --git a/code/modules/buildmode/buttons.dm b/code/modules/buildmode/buttons.dm
index 7eff2cdae2f..4c8a01ac9d4 100644
--- a/code/modules/buildmode/buttons.dm
+++ b/code/modules/buildmode/buttons.dm
@@ -84,5 +84,6 @@
 	name = "Quit Buildmode"
 
 /atom/movable/screen/buildmode/quit/Click()
+	bd.mode.exit_mode(bd) // so area_edit won't leave highlighted icons
 	bd.quit()
 	return TRUE