--- a/autotests/t-xdg-settings.sh
+++ b/autotests/t-xdg-settings.sh
@@ -10,6 +10,12 @@ assert_equal mosaic.desktop \
 assert_run gconftool-2 --get /desktop/gnome/applications/browser/exec
 
 for de in gnome3 cinnamon lxde mate generic; do
+    test_that_it sets defaults even on complex desktop files
+    mock_desktop_file cat %u
+    run $de xdg-settings set default-web-browser cat.desktop
+    assert_equal cat.desktop \
+                 "$(run $de xdg-settings get default-web-browser)"
+	    
     test_that_it determines default browser from \
                  \$XDG_CONFIG_HOME/mimeapps.list in $de
     mock_default_app x-scheme-handler/http mosaic
--- a/autotests/test-lib.sh
+++ b/autotests/test-lib.sh
@@ -137,6 +137,11 @@ mock_desktop_file() {
 Type=Application
 Name=$1
 Exec=$*
+Actions=NewWindow
+
+[Desktop Action NewWindow]
+Name=$1 New Window
+Exec=$* arg arg
 EOF
 }