diff --git a/common.inc b/common.inc
index b8cff7e..fe41d47 100644
--- a/common.inc
+++ b/common.inc
@@ -474,6 +474,13 @@
 
   menuconfig.init
 
+  "nomodeset" getgfxconfig dup .undef ne {
+    "true" eq { 
+        /fulloptions.nomodeset_default true def
+    } {
+        /fulloptions.nomodeset_default false def
+    }  ifelse
+  } { pop } ifelse
   "audio" getgfxconfig dup .undef ne {
     "true" eq { 
         /audio.use true def
diff --git a/dia_fulloptions.inc b/dia_fulloptions.inc
index 20100a0..608b2a6 100644
--- a/dia_fulloptions.inc
+++ b/dia_fulloptions.inc
@@ -7,6 +7,7 @@
 
 /fulloptions.option .undef def
 /fulloptions.composite .undef def
+/fulloptions.nomodeset_default false def
 /xmenu.fulloptions .undef def
 
 /.fulloptions.expert 0 def
@@ -71,9 +72,14 @@
   0 1 xmenu .xm_list get length 1 sub {
     xmenu .xm_allselected get exch false put
   } for
+
+  fulloptions.nomodeset_default {
+    xmenu .xm_allselected get .fulloptions.nomodeset over over get not put
+  } if
   
   pmenu.init
   menu.entry fulloptions.filter
+  fulloptions.change
 } def
 
 % - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -