diff --git a/roles/home-gui/files/gnome-setup.sh b/roles/home-gui/files/gnome-setup.sh
index 0075a68..d5b4f6d 100644
--- a/roles/home-gui/files/gnome-setup.sh
+++ b/roles/home-gui/files/gnome-setup.sh
@@ -40,14 +40,21 @@ set_keyboard_and_language () {
     # Set custom keybindings.
     if [ -x /usr/bin/ptyxis ]
     then
-        _acp_term="/usr/bin/ptyxis --new-window"
+        _acp_term="/usr/bin/ptyxis"
     else
         _acp_term=/usr/bin/gnome-terminal
     fi
+
+    # Launch terminal from Super-Return shortcut.
     gsettings set org.gnome.settings-daemon.plugins.media-keys custom-keybindings "['/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/launch-terminal/']"
-    gsettings set org.gnome.settings-daemon.plugins.media-keys.custom-keybinding:/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/launch-terminal/ command "$_acp_term"
+    gsettings set org.gnome.settings-daemon.plugins.media-keys.custom-keybinding:/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/launch-terminal/ command "$_acp_term --new-window"
     gsettings set org.gnome.settings-daemon.plugins.media-keys.custom-keybinding:/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/launch-terminal/ name 'Launch Terminal'
     gsettings set org.gnome.settings-daemon.plugins.media-keys.custom-keybinding:/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/launch-terminal/ binding '<Super>Return'
+
+    # Set default Gnome terminal.
+    gsettings set org.gnome.desktop.default-applications.terminal exec "$_acp_term"
+    gsettings set org.gnome.desktop.default-applications.terminal exec-arg "--new-window -x"
+
     unset _acp_term
 }
 set_keyboard_and_language