diff --git a/src/conio/ciolib.c b/src/conio/ciolib.c
index f2683b17a1fc925fb275ce14fdbcfe68fe40c038..f1259948104793ca4fceb035f23e764ae4b405e2 100644
--- a/src/conio/ciolib.c
+++ b/src/conio/ciolib.c
@@ -93,6 +93,7 @@ CIOLIBEXPORT enum ciolib_scaling ciolib_initial_scaling_type = CIOLIB_SCALING_IN
 CIOLIBEXPORT const void * ciolib_initial_icon = syncicon64;
 CIOLIBEXPORT size_t ciolib_initial_icon_width = SYNCICON64_WIDTH;
 CIOLIBEXPORT const char *ciolib_initial_program_name = "CIOLIB";
+CIOLIBEXPORT const char *ciolib_initial_program_class = "CIOLIB";
 CIOLIBEXPORT const uint32_t *ciolib_r2yptr;
 CIOLIBEXPORT const uint32_t *ciolib_y2rptr;
 
diff --git a/src/conio/ciolib.h b/src/conio/ciolib.h
index a1986ff04593a03c412f30e5a22956f406cf12a6..c4f74421600ef5ba3fc1ca692acf5f5111723cd3 100644
--- a/src/conio/ciolib.h
+++ b/src/conio/ciolib.h
@@ -420,6 +420,7 @@ CIOLIBEXPORTVAR enum ciolib_scaling ciolib_initial_scaling_type;
 CIOLIBEXPORTVAR const void * ciolib_initial_icon;
 CIOLIBEXPORTVAR size_t ciolib_initial_icon_width;
 CIOLIBEXPORTVAR const char *ciolib_initial_program_name;
+CIOLIBEXPORTVAR const char *ciolib_initial_program_class;
 CIOLIBEXPORTVAR const uint32_t *ciolib_r2yptr;
 CIOLIBEXPORTVAR const uint32_t *ciolib_y2rptr;
 
diff --git a/src/conio/x_events.c b/src/conio/x_events.c
index 64b817421b9e730850829669d0c2bc34e86a5254..4d0d87a19e211dab20b01f9c38bba721ef84624e 100644
--- a/src/conio/x_events.c
+++ b/src/conio/x_events.c
@@ -582,7 +582,7 @@ static int init_window()
 	classhints=x11.XAllocClassHint();
 	if (classhints) {
 		classhints->res_name = ciolib_initial_program_name;
-		classhints->res_class = "CIOLIB";
+		classhints->res_class = ciolib_initial_program_class;
 	}
 	wmhints=x11.XAllocWMHints();
 	wmhints->flags = 0;
diff --git a/src/syncterm/syncterm.c b/src/syncterm/syncterm.c
index b3db3c907572beac669cc6ef57b31f5ec6388adc..f3d3b9fbd449953e879e6f3c6d89a1f28bd83dc9 100644
--- a/src/syncterm/syncterm.c
+++ b/src/syncterm/syncterm.c
@@ -1561,6 +1561,7 @@ main(int argc, char **argv)
 	ciolib_initial_icon_width = syncterm_icon.width;
 	ciolib_initial_scaling = settings.scaling_factor;
 	ciolib_initial_program_name = "syncterm";
+	ciolib_initial_program_class = "SyncTERM";
 	ciolib_mode = settings.output_mode;
 	if (settings.startup_mode != SCREEN_MODE_CURRENT)
 		text_mode = screen_to_ciolib(settings.startup_mode);