diff --git a/fiscalyear.py b/fiscalyear.py
index 209f77177f..f9725b877d 100644
--- a/fiscalyear.py
+++ b/fiscalyear.py
@@ -83,19 +83,24 @@ class FiscalYear(Workflow, ModelSQL, ModelView):
                 'create_period': {
                     'invisible': ((Eval('state') != 'open')
                         | Eval('periods', [0])),
+                    'depends': ['state'],
                     },
                 'create_period_3': {
                     'invisible': ((Eval('state') != 'open')
                         | Eval('periods', [0])),
+                    'depends': ['state'],
                     },
                 'close': {
                     'invisible': Eval('state') != 'open',
+                    'depends': ['state'],
                     },
                 'reopen': {
                     'invisible': Eval('state') != 'close',
+                    'depends': ['state'],
                     },
                 'lock': {
                     'invisible': Eval('state') != 'close',
+                    'depends': ['state'],
                     },
                 })
 
diff --git a/journal.py b/journal.py
index 61689d0471..d1839c88f9 100644
--- a/journal.py
+++ b/journal.py
@@ -346,9 +346,11 @@ class JournalPeriod(Workflow, ModelSQL, ModelView):
         cls._buttons.update({
                 'close': {
                     'invisible': Eval('state') != 'open',
+                    'depends': ['state'],
                     },
                 'reopen': {
                     'invisible': Eval('state') != 'close',
+                    'depends': ['state'],
                     },
                 })
 
diff --git a/move.py b/move.py
index 8a143187d8..0478f717e3 100644
--- a/move.py
+++ b/move.py
@@ -100,6 +100,7 @@ class Move(ModelSQL, ModelView):
         cls._buttons.update({
                 'post': {
                     'invisible': Eval('state') == 'posted',
+                    'depends': ['state'],
                     },
                 })
 
diff --git a/period.py b/period.py
index e677610102..9138ab686d 100644
--- a/period.py
+++ b/period.py
@@ -94,12 +94,15 @@ class Period(Workflow, ModelSQL, ModelView):
         cls._buttons.update({
                 'close': {
                     'invisible': Eval('state') != 'open',
+                    'depends': ['state'],
                     },
                 'reopen': {
                     'invisible': Eval('state') != 'close',
+                    'depends': ['state'],
                     },
                 'lock': {
                     'invisible': Eval('state') != 'close',
+                    'depends': ['state'],
                     },
                 })