diff --git a/ChangeLog b/ChangeLog
index b70d187f58..944cd8ff3a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jan 25 21:16:57 CET 2000  Sven Neumann <sven@gimp.org>
+
+	* app/gdisplay.c: disable "Layer to Imagesize" on empty images
+
 Tue Jan 25 20:08:35 CET 2000  Sven Neumann <sven@gimp.org>
 
 	* plug-ins/common/colorify.c: use gimp_tile_cache_ntiles ()
diff --git a/app/core/gimpprojection.c b/app/core/gimpprojection.c
index 6686b4c852..284a15950b 100644
--- a/app/core/gimpprojection.c
+++ b/app/core/gimpprojection.c
@@ -1714,7 +1714,6 @@ gdisplay_set_menu_sensitivity (GDisplay *gdisp)
     }
 
   SET_SENSITIVE ("Layers/Stack", gdisp);
-  SET_SENSITIVE ("Layers/Rotate", gdisp);
   if (gdisp)
     {
       SET_SENSITIVE ("Layers/Stack/Previous Layer",
@@ -1730,6 +1729,8 @@ gdisplay_set_menu_sensitivity (GDisplay *gdisp)
       SET_SENSITIVE ("Layers/Stack/Layer to Bottom",
 		     !fs && !aux && lp && alpha && lind < (lnum - 1));
     }
+  SET_SENSITIVE ("Layers/Rotate", gdisp && !aux && !lm & lp);
+  SET_SENSITIVE ("Layers/Layer to Imagesize", gdisp && !aux && lp);
 
   SET_SENSITIVE ("Layers/Anchor Layer", gdisp && fs && !aux && lp);
   SET_SENSITIVE ("Layers/Merge Visible Layers...", gdisp && !fs && !aux && lp);
diff --git a/app/display/gimpdisplay.c b/app/display/gimpdisplay.c
index 6686b4c852..284a15950b 100644
--- a/app/display/gimpdisplay.c
+++ b/app/display/gimpdisplay.c
@@ -1714,7 +1714,6 @@ gdisplay_set_menu_sensitivity (GDisplay *gdisp)
     }
 
   SET_SENSITIVE ("Layers/Stack", gdisp);
-  SET_SENSITIVE ("Layers/Rotate", gdisp);
   if (gdisp)
     {
       SET_SENSITIVE ("Layers/Stack/Previous Layer",
@@ -1730,6 +1729,8 @@ gdisplay_set_menu_sensitivity (GDisplay *gdisp)
       SET_SENSITIVE ("Layers/Stack/Layer to Bottom",
 		     !fs && !aux && lp && alpha && lind < (lnum - 1));
     }
+  SET_SENSITIVE ("Layers/Rotate", gdisp && !aux && !lm & lp);
+  SET_SENSITIVE ("Layers/Layer to Imagesize", gdisp && !aux && lp);
 
   SET_SENSITIVE ("Layers/Anchor Layer", gdisp && fs && !aux && lp);
   SET_SENSITIVE ("Layers/Merge Visible Layers...", gdisp && !fs && !aux && lp);
diff --git a/app/gdisplay.c b/app/gdisplay.c
index 6686b4c852..284a15950b 100644
--- a/app/gdisplay.c
+++ b/app/gdisplay.c
@@ -1714,7 +1714,6 @@ gdisplay_set_menu_sensitivity (GDisplay *gdisp)
     }
 
   SET_SENSITIVE ("Layers/Stack", gdisp);
-  SET_SENSITIVE ("Layers/Rotate", gdisp);
   if (gdisp)
     {
       SET_SENSITIVE ("Layers/Stack/Previous Layer",
@@ -1730,6 +1729,8 @@ gdisplay_set_menu_sensitivity (GDisplay *gdisp)
       SET_SENSITIVE ("Layers/Stack/Layer to Bottom",
 		     !fs && !aux && lp && alpha && lind < (lnum - 1));
     }
+  SET_SENSITIVE ("Layers/Rotate", gdisp && !aux && !lm & lp);
+  SET_SENSITIVE ("Layers/Layer to Imagesize", gdisp && !aux && lp);
 
   SET_SENSITIVE ("Layers/Anchor Layer", gdisp && fs && !aux && lp);
   SET_SENSITIVE ("Layers/Merge Visible Layers...", gdisp && !fs && !aux && lp);