diff --git a/FCHost/fchost/fchost_handler_linux.cc b/FCHost/fchost/fchost_handler_linux.cc
index f960f287892e3759892627a28edfd9076d77931f..d78e9f63c1c85af0a4f46e901d59204d1f4b7ebf 100644
--- a/FCHost/fchost/fchost_handler_linux.cc
+++ b/FCHost/fchost/fchost_handler_linux.cc
@@ -70,7 +70,7 @@ namespace {
 
 		switch (mode) {
 			case CefDialogHandler::FileDialogMode::FILE_DIALOG_OPEN_MULTIPLE:
-				cmdLine << " --multiple"; [[fallthrough]]
+				cmdLine << " --multiple"; [[fallthrough]];
 			case CefDialogHandler::FileDialogMode::FILE_DIALOG_OPEN:
 				cmdLine << " --getopenfilename";
 				break;
@@ -171,7 +171,8 @@ namespace {
 		// we will try to launch kdialog or zenity
 		std::string dialogExecutable;
 		// try to determine which environment we run inside
-		std::string desktop = getenv("XDG_CURRENT_DESKTOP");
+		const char* desktop_env = getenv("XDG_CURRENT_DESKTOP");
+		std::string desktop = desktop_env == nullptr ? "" : desktop_env;
 
 		const auto checkExeExists = [](const char* name) {
 			int ec = ::system((std::string(name) + " --help > /dev/null").c_str());