diff --git a/plugins/classbuilder.c b/plugins/classbuilder.c
index 980cfbdab..56db18893 100644
--- a/plugins/classbuilder.c
+++ b/plugins/classbuilder.c
@@ -630,7 +630,7 @@ static void cc_dlg_update_file_names(CreateClassDialog *cc_dlg)
 	{
 		case GEANY_CLASS_TYPE_CPP:
 		{
-			class_header = g_strconcat(class_name_down, ".h", NULL);
+			class_header = g_strconcat(class_name_down, ".hpp", NULL);
 			class_source = g_strconcat(class_name_down, ".cpp", NULL);
 			break;
 		}