diff --git a/ChangeLog b/ChangeLog
index 17ec9508c8..585eb36a59 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-03-23  Sven Neumann  <sven@gimp.org>
+
+	* app/display/gimpdisplayoptions.c: avoid code duplication by
+	using a #define.
+
+	* app/config/gimpdisplayconfig.c: for fullscreen mode, default to
+	the same settings as we do for normal editing mode.
+
 2006-03-23  Sven Neumann  <sven@gimp.org>
 
 	* plug-ins/common/psd.c
diff --git a/app/config/gimpdisplayconfig.c b/app/config/gimpdisplayconfig.c
index c91526b315..68b9502de6 100644
--- a/app/config/gimpdisplayconfig.c
+++ b/app/config/gimpdisplayconfig.c
@@ -235,7 +235,7 @@ gimp_display_config_init (GimpDisplayConfig *config)
                     config);
 
   config->default_fullscreen_view =
-    g_object_new (GIMP_TYPE_DISPLAY_OPTIONS_FULLSCREEN, NULL);
+    g_object_new (GIMP_TYPE_DISPLAY_OPTIONS, NULL);
 
   g_signal_connect (config->default_fullscreen_view, "notify",
                     G_CALLBACK (gimp_display_config_fullscreen_notify),
diff --git a/app/display/gimpdisplayoptions.c b/app/display/gimpdisplayoptions.c
index 5896693c98..3666a44a3e 100644
--- a/app/display/gimpdisplayoptions.c
+++ b/app/display/gimpdisplayoptions.c
@@ -73,6 +73,8 @@ G_DEFINE_TYPE_WITH_CODE (GimpDisplayOptions,
 typedef struct _GimpDisplayOptions      GimpDisplayOptionsFullscreen;
 typedef struct _GimpDisplayOptionsClass GimpDisplayOptionsFullscreenClass;
 
+#define gimp_display_options_fullscreen_init gimp_display_options_init
+
 G_DEFINE_TYPE_WITH_CODE (GimpDisplayOptionsFullscreen,
                          gimp_display_options_fullscreen,
                          GIMP_TYPE_DISPLAY_OPTIONS,
@@ -201,12 +203,6 @@ gimp_display_options_init (GimpDisplayOptions *options)
   options->padding_mode_set = FALSE;
 }
 
-static void
-gimp_display_options_fullscreen_init (GimpDisplayOptionsFullscreen *options)
-{
-  options->padding_mode_set = FALSE;
-}
-
 static void
 gimp_display_options_set_property (GObject      *object,
                                    guint         property_id,