diff --git a/radiant/eclass_def.cpp b/radiant/eclass_def.cpp
index c78ce069..7f123177 100644
--- a/radiant/eclass_def.cpp
+++ b/radiant/eclass_def.cpp
@@ -268,6 +268,11 @@ EntityClass *Eclass_InitFromText( const char *text ){
 			if ( !p ) {
 				break;
 			}
+			if( string_equal( Get_COM_Token(), "-" )
+			 || string_equal( Get_COM_Token(), "x" )
+			 || string_equal_prefix_nocase( Get_COM_Token(), "unused" ) ){
+				continue;
+			}
 			strncpy( e->flagnames[i], Get_COM_Token(), std::size( e->flagnames[i] ) - 1 );
 		}
 	}
diff --git a/radiant/entityinspector.cpp b/radiant/entityinspector.cpp
index 4dd0eb39..e8ac20b8 100644
--- a/radiant/entityinspector.cpp
+++ b/radiant/entityinspector.cpp
@@ -856,7 +856,7 @@ void SpawnFlags_setEntityClass( EntityClass* eclass ){
 	// do a first pass to count the spawn flags, don't touch the widgets, we don't know in what state they are
 	for ( int i = 0; i < MAX_FLAGS; i++ )
 	{
-		if ( eclass->flagnames[i][0] != 0 && strcmp( eclass->flagnames[i], "-" ) ) {
+		if ( !string_empty( eclass->flagnames[i] ) ) {
 			spawn_table[g_spawnflag_count++] = i;
 		}
 		// hide all boxes