diff --git a/airgun/entities/host.py b/airgun/entities/host.py
index e724b55b8..4e550120c 100644
--- a/airgun/entities/host.py
+++ b/airgun/entities/host.py
@@ -464,6 +464,7 @@ def step(self, *args, **kwargs):
         entity_name = kwargs.get('entity_name')
         self.parent.search(entity_name)
         self.parent.table.row(name=entity_name)['Actions'].widget.fill('Edit')
+        self.view.wait_displayed()
 
 
 @navigator.register(HostEntity, 'Select Action')