diff -Naru -X /usr/src/dontdiff gthumb-2.5.1/data/glade/gthumb_comments.glade gthumb/data/glade/gthumb_comments.glade
--- gthumb-2.5.1/data/glade/gthumb_comments.glade	2004-09-02 10:44:35.000000000 +0200
+++ gthumb/data/glade/gthumb_comments.glade	2004-09-30 01:12:22.000000000 +0200
@@ -425,8 +425,8 @@
 		<packing>
 		  <property name="left_attach">1</property>
 		  <property name="right_attach">2</property>
-		  <property name="top_attach">0</property>
-		  <property name="bottom_attach">1</property>
+		  <property name="top_attach">3</property>
+		  <property name="bottom_attach">4</property>
 		  <property name="y_options">fill</property>
 		</packing>
 	      </child>
@@ -471,8 +471,8 @@
 		<packing>
 		  <property name="left_attach">0</property>
 		  <property name="right_attach">1</property>
-		  <property name="top_attach">0</property>
-		  <property name="bottom_attach">1</property>
+		  <property name="top_attach">3</property>
+		  <property name="bottom_attach">4</property>
 		  <property name="x_options">fill</property>
 		</packing>
 	      </child>
@@ -495,8 +495,8 @@
 		<packing>
 		  <property name="left_attach">0</property>
 		  <property name="right_attach">1</property>
-		  <property name="top_attach">1</property>
-		  <property name="bottom_attach">2</property>
+		  <property name="top_attach">0</property>
+		  <property name="bottom_attach">1</property>
 		  <property name="x_options">fill</property>
 		</packing>
 	      </child>
@@ -519,9 +519,47 @@
 		<packing>
 		  <property name="left_attach">0</property>
 		  <property name="right_attach">1</property>
+		  <property name="top_attach">1</property>
+		  <property name="bottom_attach">2</property>
+		  <property name="x_options">fill</property>
+		  <property name="y_options"></property>
+		</packing>
+	      </child>
+
+	      <child>
+		<widget class="GnomeDateEdit" id="date_dateedit">
+		  <property name="visible">True</property>
+		  <property name="dateedit_flags">GNOME_DATE_EDIT_SHOW_TIME|GNOME_DATE_EDIT_24_HR|GNOME_DATE_EDIT_WEEK_STARTS_ON_MONDAY</property>
+		  <property name="lower_hour">0</property>
+		  <property name="upper_hour">23</property>
+		</widget>
+		<packing>
+		  <property name="left_attach">1</property>
+		  <property name="right_attach">2</property>
 		  <property name="top_attach">2</property>
 		  <property name="bottom_attach">3</property>
-		  <property name="x_options">fill</property>
+		  <property name="y_options"></property>
+		</packing>
+	      </child>
+
+	      <child>
+		<widget class="GtkEntry" id="place_entry">
+		  <property name="visible">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="has_focus">True</property>
+		  <property name="editable">True</property>
+		  <property name="visibility">True</property>
+		  <property name="max_length">0</property>
+		  <property name="text" translatable="yes"></property>
+		  <property name="has_frame">True</property>
+		  <property name="invisible_char" translatable="yes">*</property>
+		  <property name="activates_default">False</property>
+		</widget>
+		<packing>
+		  <property name="left_attach">1</property>
+		  <property name="right_attach">2</property>
+		  <property name="top_attach">0</property>
+		  <property name="bottom_attach">1</property>
 		  <property name="y_options"></property>
 		</packing>
 	      </child>
@@ -536,11 +574,11 @@
 		    <widget class="GtkMenu" id="menu1">
 
 		      <child>
-			<widget class="GtkMenuItem" id="no_date1">
+			<widget class="GtkMenuItem" id="photo_digitalization_date_(from_exif_data)1">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">No date</property>
+			  <property name="label" translatable="yes">Photo digitalization date (From EXIF data)</property>
 			  <property name="use_underline">True</property>
-			  <signal name="activate" handler="on_no_date1_activate" last_modification_time="Mon, 02 Jun 2003 19:35:05 GMT"/>
+			  <signal name="activate" handler="on_photo_digitalization_date_(from_exif_data)1_activate" last_modification_time="Mon, 02 Jun 2003 19:35:05 GMT"/>
 			</widget>
 		      </child>
 
@@ -563,15 +601,6 @@
 		      </child>
 
 		      <child>
-			<widget class="GtkMenuItem" id="photo_digitalization_date_(from_exif_data)1">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Photo digitalization date (From EXIF data)</property>
-			  <property name="use_underline">True</property>
-			  <signal name="activate" handler="on_photo_digitalization_date_(from_exif_data)1_activate" last_modification_time="Mon, 02 Jun 2003 19:35:05 GMT"/>
-			</widget>
-		      </child>
-
-		      <child>
 			<widget class="GtkMenuItem" id="last_modified_date1">
 			  <property name="visible">True</property>
 			  <property name="label" translatable="yes">Last modified date</property>
@@ -590,6 +619,15 @@
 		      </child>
 
 		      <child>
+			<widget class="GtkMenuItem" id="no_date1">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">No date</property>
+			  <property name="use_underline">True</property>
+			  <signal name="activate" handler="on_no_date1_activate" last_modification_time="Mon, 02 Jun 2003 19:35:05 GMT"/>
+			</widget>
+		      </child>
+
+		      <child>
 			<widget class="GtkMenuItem" id="no_change1">
 			  <property name="visible">True</property>
 			  <property name="label" translatable="yes">Do not modify</property>
@@ -603,46 +641,9 @@
 		<packing>
 		  <property name="left_attach">1</property>
 		  <property name="right_attach">2</property>
-		  <property name="top_attach">2</property>
-		  <property name="bottom_attach">3</property>
-		  <property name="x_options">fill</property>
-		  <property name="y_options"></property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GnomeDateEdit" id="date_dateedit">
-		  <property name="visible">True</property>
-		  <property name="dateedit_flags">GNOME_DATE_EDIT_SHOW_TIME|GNOME_DATE_EDIT_24_HR|GNOME_DATE_EDIT_WEEK_STARTS_ON_MONDAY</property>
-		  <property name="lower_hour">0</property>
-		  <property name="upper_hour">23</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">1</property>
-		  <property name="right_attach">2</property>
-		  <property name="top_attach">3</property>
-		  <property name="bottom_attach">4</property>
-		  <property name="y_options"></property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkEntry" id="place_entry">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="editable">True</property>
-		  <property name="visibility">True</property>
-		  <property name="max_length">0</property>
-		  <property name="text" translatable="yes"></property>
-		  <property name="has_frame">True</property>
-		  <property name="invisible_char" translatable="yes">*</property>
-		  <property name="activates_default">True</property>
-		</widget>
-		<packing>
-		  <property name="left_attach">1</property>
-		  <property name="right_attach">2</property>
 		  <property name="top_attach">1</property>
 		  <property name="bottom_attach">2</property>
+		  <property name="x_options">fill</property>
 		  <property name="y_options"></property>
 		</packing>
 	      </child>
diff -Naru -X /usr/src/dontdiff gthumb-2.5.1/src/dlg-comment.c gthumb/src/dlg-comment.c
--- gthumb-2.5.1/src/dlg-comment.c	2004-09-02 10:44:36.000000000 +0200
+++ gthumb/src/dlg-comment.c	2004-09-30 01:12:22.000000000 +0200
@@ -446,7 +446,7 @@
 
 	/* run dialog. */
 
-	gtk_widget_grab_focus (data->note_text_view);
+	gtk_widget_grab_focus (data->place_entry);
 
 	{
 		GtkWidget *parent_win = window->viewer;