diff --git a/capplets/mouse/ChangeLog b/capplets/mouse/ChangeLog
index 8d6d5879b..fc9aa7efd 100644
--- a/capplets/mouse/ChangeLog
+++ b/capplets/mouse/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-24  Sven Herzberg  <herzi@gnome-de.org>
+
+	* gnome-mouse-properties.c: fix the non-xcursor case for solaris;
+	closes: #319125 (based upon patch from Glynn Foster)
+
 2006-07-23  Sebastien Bacher  <seb128@debian.org>
 
 	* gnome-settings-mouse.desktop.in.in:
diff --git a/capplets/mouse/gnome-mouse-properties.c b/capplets/mouse/gnome-mouse-properties.c
index 73941490b..21e962182 100644
--- a/capplets/mouse/gnome-mouse-properties.c
+++ b/capplets/mouse/gnome-mouse-properties.c
@@ -549,7 +549,7 @@ cursor_font_changed (GConfClient *client,
 				    -1);
 		gtk_tree_model_sort_convert_child_iter_to_iter
 			(GTK_TREE_MODEL_SORT(smodel), &sort_iter, &iter);
-		if ((temp_cursor_font == NULL && cursor_font == NULL) ||
+		if ((cursor_font == NULL) || 
 		    ((temp_cursor_font != NULL && cursor_font != NULL) &&
 		     (!strcmp (cursor_font, temp_cursor_font)))) {
 			if (!gtk_tree_selection_iter_is_selected (selection, &sort_iter))
@@ -794,6 +794,10 @@ populate_tree_model(GtkTreeModelSort* model, GtkTreeSelection* selection) {
 	// add the default x font cursors
 	cursor_font = read_cursor_font();
 
+	if(!cursor_font) {
+		cursor_font = g_strdup (builtins[0][0]);
+	}
+
 	for(i = 0; i < G_N_ELEMENTS(builtins); i++) {
 		GtkTreeIter iter;
 		gchar* cursor_string;