diff --git a/golem_resource_account/wizard/golem_reservation_invoice_views.xml b/golem_resource_account/wizard/golem_reservation_invoice_views.xml
index d2ec5a2..71ba8f5 100644
--- a/golem_resource_account/wizard/golem_reservation_invoice_views.xml
+++ b/golem_resource_account/wizard/golem_reservation_invoice_views.xml
@@ -33,7 +33,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
             </strong>
           </p>
           <footer>
-            <button name="create_invoice" string="Create Invoice" type="object"
+            <button name="create_invoice" string="Create and view invoice" type="object"
+              context="{'open_invoice': True}" class="oe_highlight" />
+            <button name="create_invoice" string="Create invoice and Close" type="object"
               class="oe_highlight" />
             <button string="Cancel" class="oe_link" special="cancel" />
           </footer>