diff --git a/account_move_line_tax_editable/__manifest__.py b/account_move_line_tax_editable/__manifest__.py
index 217050c8a..1a7d17dd3 100644
--- a/account_move_line_tax_editable/__manifest__.py
+++ b/account_move_line_tax_editable/__manifest__.py
@@ -6,7 +6,7 @@
     'name': 'Account Move Line Tax Editable',
     'summary': """
         Allows to edit taxes on non-posted account move lines""",
-    'version': '10.0.1.0.0',
+    'version': '10.0.1.0.1',
     'license': 'AGPL-3',
     'author': 'ACSONE SA/NV,Odoo Community Association (OCA)',
     'website': 'https://www.acsone.eu',
diff --git a/account_move_line_tax_editable/models/account_move_line.py b/account_move_line_tax_editable/models/account_move_line.py
index 551ce637a..a79a30828 100644
--- a/account_move_line_tax_editable/models/account_move_line.py
+++ b/account_move_line_tax_editable/models/account_move_line.py
@@ -6,7 +6,6 @@ from odoo import api, fields, models
 
 
 class AccountMoveLine(models.Model):
-
     _inherit = 'account.move.line'
 
     is_tax_editable = fields.Boolean(
@@ -21,4 +20,4 @@ class AccountMoveLine(models.Model):
     @api.multi
     def _get_is_tax_editable(self):
         self.ensure_one()
-        return self.move_id.state == 'draft'
+        return not self.move_id or self.move_id.state == 'draft'
diff --git a/account_move_line_tax_editable/views/account_move.xml b/account_move_line_tax_editable/views/account_move.xml
index a430cb2d0..748a73841 100644
--- a/account_move_line_tax_editable/views/account_move.xml
+++ b/account_move_line_tax_editable/views/account_move.xml
@@ -1,16 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright 2017 ACSONE SA/NV
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
-
 <odoo>
-<data>
-
     <record model="ir.ui.view" id="account_move_form_view">
         <field name="name">account.move.form (in account_move_line_tax_editable)</field>
         <field name="model">account.move</field>
         <field name="inherit_id" ref="account.view_move_form"/>
         <field name="arch" type="xml">
             <xpath expr="//field[@name='line_ids']/tree/field[@name='name']" position="after">
+                <field name="move_id" invisible="1"/>
                 <field name="is_tax_editable" invisible="1"/>
                 <field name="tax_line_id" attrs="{'readonly': [('is_tax_editable', '=', False)]}"/>
                 <field name="tax_ids" attrs="{'readonly': [('is_tax_editable', '=', False)]}"
@@ -18,6 +16,4 @@
             </xpath>
         </field>
     </record>
-
-</data>
 </odoo>
diff --git a/account_move_line_tax_editable/views/account_move_line.xml b/account_move_line_tax_editable/views/account_move_line.xml
index 30e556488..362db3ad4 100644
--- a/account_move_line_tax_editable/views/account_move_line.xml
+++ b/account_move_line_tax_editable/views/account_move_line.xml
@@ -1,16 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright 2017 ACSONE SA/NV
      License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
-
 <odoo>
-<data>
-
     <record model="ir.ui.view" id="account_move_line_form_view">
         <field name="name">account.move.line.form (in account_move_line_tax_editable)</field>
         <field name="model">account.move.line</field>
         <field name="inherit_id" ref="account.view_move_line_form"/>
         <field name="arch" type="xml">
             <field name="tax_line_id" position="before">
+                <field name="move_id" invisible="1"/>
                 <field name="is_tax_editable" invisible="1"/>
             </field>
             <field name="tax_line_id" position="attributes">
@@ -23,6 +21,4 @@
             </field>
         </field>
     </record>
-
-</data>
 </odoo>