diff --git a/AppDir/bin/launch-gui.hook b/AppDir/bin/launch-gui.hook
new file mode 100644
index 0000000..6e2dc79
--- /dev/null
+++ b/AppDir/bin/launch-gui.hook
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+# Launch the GUI when AppImage is double clicked
+if [ "${ARG0##*/}" = "${APPIMAGE##*/}" ] && [ -z "$1" ]; then
+	[ -t 0 ] || set -- --gui
+fi
diff --git a/AppDir/org.octave.Octave.desktop b/AppDir/org.octave.Octave.desktop
deleted file mode 100644
index 010a841..0000000
--- a/AppDir/org.octave.Octave.desktop
+++ /dev/null
@@ -1,22 +0,0 @@
-[Desktop Entry]
-Name=GNU Octave
-Comment=Interactive programming environment for numerical computations
-Comment[ca]=Entorn de programació interactiva per a càlculs numèrics
-Comment[de]=Interaktive Programmierumgebung für numerische Berechnungen
-Comment[es]=Entorno de programación interactiva para cálculos numéricos
-Comment[fr]=Environnement de programmation interactif pour le calcul numérique
-Comment[hu]=Interaktív programozási környezet számszerű számításokhoz
-Comment[it]=Ambiente di programmazione interattivo per il calcolo numerico
-Comment[ja]=数値計算のための対話的なプログラミング環境
-Comment[nl]=Interactieve programmeeromgeving voor numerieke berekeningen
-Comment[pt]=Ambiente de programação interativo para computação numérica
-Comment[zh]=数值计算交互式编程环境
-Exec=octave-gui
-Icon=octave
-Terminal=false
-Type=Application
-Categories=Education;Science;Math;
-StartupNotify=false
-StartupWMClass=org.octave.Octave
-MimeType=text/x-octave;text/x-matlab;
-Keywords=science;math;matrix;numerical computation;plotting;
diff --git a/README.md b/README.md
index 6901bee..ee67a2d 100644
--- a/README.md
+++ b/README.md
@@ -17,8 +17,6 @@
 
 </div>
 
-### ⚠️ Use `--gui` to start with Qt interface ⚠️
-
 ---
 
 AppImage made using [sharun](https://github.com/VHSgunzo/sharun) and its wrapper [quick-sharun](https://github.com/pkgforge-dev/Anylinux-AppImages/blob/main/useful-tools/quick-sharun.sh), which makes it extremely easy to turn any binary into a portable package reliably without using containers or similar tricks. 
diff --git a/make-appimage.sh b/make-appimage.sh
index 814131b..03d9e2c 100644
--- a/make-appimage.sh
+++ b/make-appimage.sh
@@ -8,6 +8,7 @@ export ARCH VERSION
 export OUTPATH=./dist
 export ADD_HOOKS="self-updater.bg.hook"
 export UPINFO="gh-releases-zsync|${GITHUB_REPOSITORY%/*}|${GITHUB_REPOSITORY#*/}|latest|*$ARCH.AppImage.zsync"
+export DESKTOP=/usr/share/applications/org.octave.Octave.desktop
 export ICON=/usr/share/icons/hicolor/256x256/apps/octave.png
 export DEPLOY_QT=1
 export QT_DIR=qt6