diff --git a/CMakeLists.txt b/CMakeLists.txt
index cc82669f..c2572ac7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -669,7 +669,7 @@ install(FILES DSView/icons/logo.svg DESTINATION share/icons/hicolor/scalable/app
 install(FILES DSView/icons/logo.svg DESTINATION share/pixmaps RENAME dsview.svg)
 
 if(CMAKE_SYSTEM_NAME MATCHES "Linux")	
-	install(FILES DSView/DSView.desktop DESTINATION /usr/share/applications RENAME dsview.desktop)
+	install(FILES DSView/DSView.desktop DESTINATION share/applications RENAME dsview.desktop)
 	
 	add_compile_definitions(_DEFAULT_SOURCE)
 
diff --git a/DSView/DSView.desktop b/DSView/DSView.desktop
index e1143240..399d1a68 100644
--- a/DSView/DSView.desktop
+++ b/DSView/DSView.desktop
@@ -6,5 +6,6 @@ Comment=GUI Program for DreamSourceLab USB-based Instruments
 TryExec=DSView
 Exec=DSView
 Icon=dsview
+StartupWMClass=DSView
 Terminal=false
 Categories=Development;Electronics;Qt;
diff --git a/DSView/main.cpp b/DSView/main.cpp
index 748a59d9..170377c3 100644
--- a/DSView/main.cpp
+++ b/DSView/main.cpp
@@ -174,6 +174,7 @@ bool bHighScale = true;
     QApplication::setApplicationName("DSView");
     QApplication::setOrganizationName("DreamSourceLab");
     QApplication::setOrganizationDomain("www.DreamSourceLab.com");
+    QApplication::setDesktopFileName("dsview");
 
 	//----------------------init log
 	dsv_log_init(); // Don't call before QApplication be inited