diff --git a/addons/account/models/account_payment.py b/addons/account/models/account_payment.py
index b03e5f8f684..2090d03bc30 100644
--- a/addons/account/models/account_payment.py
+++ b/addons/account/models/account_payment.py
@@ -70,9 +70,10 @@ class account_abstract_payment(models.AbstractModel):
     def default_get(self, fields):
         rec = super(account_abstract_payment, self).default_get(fields)
         active_ids = self._context.get('active_ids')
+        active_model = self._context.get('active_model')
 
         # Check for selected invoices ids
-        if not active_ids:
+        if not active_ids or active_model != 'account.invoice':
             return rec
 
         invoices = self.env['account.invoice'].browse(active_ids)
diff --git a/addons/account/tests/test_payment.py b/addons/account/tests/test_payment.py
index 3e0e1c8961d..3c22a127180 100644
--- a/addons/account/tests/test_payment.py
+++ b/addons/account/tests/test_payment.py
@@ -8,7 +8,7 @@ class TestPayment(AccountingTestCase):
 
     def setUp(self):
         super(TestPayment, self).setUp()
-        self.register_payments_model = self.env['account.register.payments']
+        self.register_payments_model = self.env['account.register.payments'].with_context(active_model='account.invoice')
         self.payment_model = self.env['account.payment']
         self.invoice_model = self.env['account.invoice']
         self.invoice_line_model = self.env['account.invoice.line']