diff --git a/src/BaseClassList.cpp b/src/BaseClassList.cpp
index 35decb3f5d..530281b9a1 100644
--- a/src/BaseClassList.cpp
+++ b/src/BaseClassList.cpp
@@ -240,8 +240,9 @@ LayoutFileIndex defaultBaseclass()
 {
 	if (BaseClassList::get().haveClass("article"))
 		return string("article");
-	else 
+	if (BaseClassList::get().empty())
 		return string("");
+	return BaseClassList::get().classList().front();
 }