diff --git a/core/src/net/sf/openrocket/gui/dialogs/EditDecalDialog.java b/core/src/net/sf/openrocket/gui/dialogs/EditDecalDialog.java
index 59ee62ce7..8a2214410 100644
--- a/core/src/net/sf/openrocket/gui/dialogs/EditDecalDialog.java
+++ b/core/src/net/sf/openrocket/gui/dialogs/EditDecalDialog.java
@@ -47,7 +47,7 @@ public class EditDecalDialog extends JDialog {
 			
 			ButtonGroup execGroup = new ButtonGroup();
 			
-			if (Desktop.getDesktop().isSupported(Desktop.Action.EDIT)) {
+			if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Desktop.Action.EDIT)) {
 				
 				systemRadio = new JRadioButton(trans.get("EditDecalDialog.lbl.system"));
 				systemRadio.setSelected(true);
diff --git a/core/src/net/sf/openrocket/gui/dialogs/preferences/PreferencesDialog.java b/core/src/net/sf/openrocket/gui/dialogs/preferences/PreferencesDialog.java
index 2318e3bd1..12d4daba9 100644
--- a/core/src/net/sf/openrocket/gui/dialogs/preferences/PreferencesDialog.java
+++ b/core/src/net/sf/openrocket/gui/dialogs/preferences/PreferencesDialog.java
@@ -490,7 +490,7 @@ public class PreferencesDialog extends JDialog {
 		panel.add(showPrompt, "wrap");
 		execGroup.add(showPrompt);
 		
-		if (Desktop.getDesktop().isSupported(Desktop.Action.EDIT)) {
+		if (Desktop.isDesktopSupported() && Desktop.getDesktop().isSupported(Desktop.Action.EDIT)) {
 			
 			JRadioButton systemRadio = new JRadioButton(trans.get("EditDecalDialog.lbl.system"));
 			systemRadio.setSelected(preferences.isDecalEditorPreferenceSystem());