diff --git a/src/Window_X11.c b/src/Window_X11.c
index d820ac7dc..1e3933bc3 100644
--- a/src/Window_X11.c
+++ b/src/Window_X11.c
@@ -338,8 +338,13 @@ static void DoCreateWindow(int width, int height) {
 	
 	/* So right name appears in e.g. Ubuntu Unity launchbar */
 	XClassHint hint = { 0 };
-	hint.res_name   = GAME_APP_TITLE;
-	hint.res_class  = GAME_APP_TITLE;
+	#ifdef CC_BUILD_FLATPAK
+          hint.res_name   = "net.classicube.flatpak.client";
+          hint.res_class  = "net.classicube.flatpak.client";
+        #else
+	  hint.res_name   = GAME_APP_TITLE;
+          hint.res_class  = GAME_APP_TITLE;
+        #endif
 	XSetClassHint(win_display, win_handle, &hint);
 	ApplyIcon();