diff --git a/src/name.cpp b/src/name.cpp
index 8140829c68..ecedcf0f31 100644
--- a/src/name.cpp
+++ b/src/name.cpp
@@ -35,6 +35,7 @@
 #include <string.h>
 #include "name.h"
 #include "c_dispatch.h"
+#include "c_console.h"
 
 // MACROS ------------------------------------------------------------------
 
@@ -268,6 +269,8 @@ FName::NameManager::~NameManager()
 {
 	NameBlock *block, *next;
 
+	C_ClearTabCommands();
+
 	for (block = Blocks; block != NULL; block = next)
 	{
 		next = block->NextBlock;