diff --git a/gnome/ChangeLog b/gnome/ChangeLog
index 78b96e50a..6279e8532 100644
--- a/gnome/ChangeLog
+++ b/gnome/ChangeLog
@@ -1,3 +1,8 @@
+1999-06-04  Robert Brady  <rwb197@ecs.soton.ac.uk>
+
+	* gscreen.c (panel_list_configure_contents): Prevent
+	divide by zero error. (Fixes bug #1360)
+
 1999-06-02  Miguel de Icaza  <miguel@nuclecu.unam.mx>
 
 	* gmain.c (xtoolkit_init): Ignore SIGTTIN and SIGTTOU.
diff --git a/gnome/gscreen.c b/gnome/gscreen.c
index 6a90dd8bf..14189e388 100644
--- a/gnome/gscreen.c
+++ b/gnome/gscreen.c
@@ -444,7 +444,7 @@ panel_file_list_configure_contents (GtkWidget *sw, WPanel *panel, int main_width
 	usable_pixels = width - extra_pixels;
 	total_columns = usable_pixels / char_width;
 	extra_columns = total_columns - used_columns;
-	if (extra_columns > 0) {
+	if (extra_columns > 0 && expandables > 0) {
 		expand_space  = extra_columns / expandables;
 		extra_space   = extra_columns % expandables;
 	} else