diff --git a/src/gnome-cmd-user-actions.cc b/src/gnome-cmd-user-actions.cc
index 16149aa..178560f 100644
--- a/src/gnome-cmd-user-actions.cc
+++ b/src/gnome-cmd-user-actions.cc
@@ -1790,13 +1790,16 @@ void view_toggle_tab_lock (GtkMenuItem *menuitem, gpointer page)
 /************** Options Menu **************/
 void options_edit (GtkMenuItem *menuitem, gpointer not_used)
 {
-    if (gnome_cmd_options_dialog (*main_win, gnome_cmd_data))
+    GnomeCmdData::Options prev_cfg = gnome_cmd_data.options;
+
+    if (!gnome_cmd_options_dialog (*main_win, gnome_cmd_data.options))
     {
-        gnome_cmd_style_create (gnome_cmd_data.options);
+        gnome_cmd_style_create (prev_cfg);
         main_win->update_style();
-
-        gnome_cmd_data.save();
+        gnome_cmd_data.options = prev_cfg;
     }
+    else
+        gnome_cmd_data.save();
 }