diff --git a/gnucash/gnome/dialog-payment.c b/gnucash/gnome/dialog-payment.c
index 3c4ad9a4ff..2f952451d3 100644
--- a/gnucash/gnome/dialog-payment.c
+++ b/gnucash/gnome/dialog-payment.c
@@ -432,7 +432,7 @@ gnc_payment_window_fill_docs_list (PaymentWindow *pw)
     g_return_if_fail (pw->docs_list_tree_view && GTK_IS_TREE_VIEW(pw->docs_list_tree_view));
 
     /* Get a list of open lots for this owner and post account */
-    if (pw->owner.owner.undefined)
+    if (pw->owner.owner.undefined && pw->post_acct)
         list = xaccAccountFindOpenLots (pw->post_acct, gncOwnerLotMatchOwnerFunc,
                                         &pw->owner, NULL);
 
diff --git a/gnucash/gtkbuilder/dialog-payment.glade b/gnucash/gtkbuilder/dialog-payment.glade
index a500f2952e..b99b45e902 100644
--- a/gnucash/gtkbuilder/dialog-payment.glade
+++ b/gnucash/gtkbuilder/dialog-payment.glade
@@ -207,8 +207,7 @@
                         <signal name="changed" handler="gnc_payment_dialog_post_to_changed_cb" swapped="no"/>
                         <child internal-child="entry">
                           <object class="GtkEntry" id="combobox-entry">
-                            <property name="can_focus">False</property>
-                            <property name="overwrite_mode">True</property>
+                            <property name="can_focus">True</property>
                           </object>
                         </child>
                       </object>