diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
index 0ba17b6e7..0cfe83ef6 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -264,22 +264,23 @@ QString SingleInstanceLocalServerName(const QString &hash) {
 
 QString GetLauncherBasename() {
 	static const auto LauncherBasename = [&] {
-		QString launcherBasename;
-
-		if (InSnap()) {
-			launcherBasename = qsl("%1_%2")
-				.arg(QString::fromLatin1(qgetenv("SNAP_NAME")))
-				.arg(qsl(MACRO_TO_STRING(TDESKTOP_LAUNCHER_BASENAME)));
-
-			LOG(("SNAP Environment detected, "
-				"launcher filename is %1.desktop")
-					.arg(launcherBasename));
-		} else {
-			launcherBasename =
-				qsl(MACRO_TO_STRING(TDESKTOP_LAUNCHER_BASENAME));
+		if (!InSnap()) {
+			return qsl(MACRO_TO_STRING(TDESKTOP_LAUNCHER_BASENAME));
 		}
 
-		return launcherBasename;
+		const auto snapNameKey =
+			qEnvironmentVariableIsSet("SNAP_INSTANCE_NAME")
+				? "SNAP_INSTANCE_NAME"
+				: "SNAP_NAME";
+
+		const auto result = qsl("%1_%2")
+			.arg(QString::fromLatin1(snapNameKey))
+			.arg(cExeName());
+
+		LOG(("SNAP Environment detected, launcher filename is %1.desktop")
+			.arg(result));
+
+		return result;
 	}();
 
 	return LauncherBasename;
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 7a14e8c45..333b45199 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -92,6 +92,7 @@ parts:
       - -DTDESKTOP_API_ID=611335
       - -DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c
       - -DDESKTOP_APP_USE_PACKAGED_FONTS=OFF
+      - -DDESKTOP_APP_USE_PACKAGED_GSL=OFF
       - -DDESKTOP_APP_USE_PACKAGED_EXPECTED=OFF
       - -DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF
       - -DTDESKTOP_USE_PACKAGED_TGVOIP=OFF
@@ -115,7 +116,6 @@ parts:
       - cmake
       - desktop-qt5
       - enchant
-      - gsl
       - range-v3
       - xxhash
 
@@ -205,15 +205,6 @@ parts:
       - --enable-relocatable
     prime: [-./bin/*]
 
-  gsl:
-    source: https://github.com/microsoft/GSL.git
-    source-depth: 1
-    source-tag: v2.1.0
-    plugin: cmake
-    configflags:
-      - -DGSL_TEST=OFF
-    prime: [-./*]
-
   range-v3:
     source: https://github.com/ericniebler/range-v3.git
     source-depth: 1