diff --git a/src/callback_func.c b/src/callback_func.c
index 12f31d8a..ec914fb1 100644
--- a/src/callback_func.c
+++ b/src/callback_func.c
@@ -435,7 +435,13 @@ callback_transfer_list_clicked(gint button, gint idx)
 
 	return;
     }
-    
+
+    if (week >= transfer_get_deadline()-1)
+    {
+	game_gui_print_message(_("You can't make an offer so close to the transfer deadline."));
+	return;
+    }
+
     stat1 = STATUS_SHOW_TRANSFER_LIST;
     stat2 = idx;
     
diff --git a/src/misc2_callbacks.c b/src/misc2_callbacks.c
index cf4fcb6c..a434fdde 100644
--- a/src/misc2_callbacks.c
+++ b/src/misc2_callbacks.c
@@ -108,17 +108,10 @@ on_button_digits_ok_clicked            (GtkButton       *button,
 	    finance_pay_loan(values[0]);
 	    break;
 	case STATUS_SHOW_TRANSFER_LIST:
-	    if (week < transfer_get_deadline()-1)
-	    {
-		if(transfer_add_offer(stat2, current_user.tm, values[0], values[1]))
-		    game_gui_print_message(_("Your offer has been updated."));
-		else
-		    game_gui_print_message(_("Your offer will be considered next week."));
-	    }
+	    if(transfer_add_offer(stat2, current_user.tm, values[0], values[1]))
+		game_gui_print_message(_("Your offer has been updated."));
 	    else
-	    {
-		game_gui_print_message(_("You can't make an offer after the transfer deadline."));
-	    }
+		game_gui_print_message(_("Your offer will be considered next week."));
 	    break;
 	case STATUS_CUSTOM_STRUCTURE:
 	    destroy_window = misc2_callback_change_structure(values[1]);