diff --git a/features/categories_block.feature b/features/categories_block.feature
index bf11b9a..2d0a68b 100644
--- a/features/categories_block.feature
+++ b/features/categories_block.feature
@@ -25,7 +25,6 @@ Feature: categories_block
       | environment | CategoriesBlock |
     And I am logged in as admin
     And I go to /admin/environment_design
-    And display ".button-bar"
 
   # Note that this @ignore-hidden-elements only works for seeing hidden
   # elements. It actually doesn't work for following hidden link or pressing
@@ -33,7 +32,8 @@ Feature: categories_block
   # the link.
   @selenium @ignore-hidden-elements
   Scenario: List just product categories
-    Given I follow "Edit" within ".categories-block"
+    Given display ".button-bar"
+    And I follow "Edit" within ".categories-block"
     And I check "Product"
     When I press "Save"
     Then I should see "Food"
@@ -44,7 +44,8 @@ Feature: categories_block
 
   @selenium
   Scenario: Show submenu if it exists
-    Given I follow "Edit" within ".categories-block"
+    Given display ".button-bar"
+    And I follow "Edit" within ".categories-block"
     And I check "Product"
     And I press "Save"
     Then I should see "Food"
@@ -61,7 +62,8 @@ Feature: categories_block
 
   @selenium
   Scenario: Show only one submenu per time
-    Given I follow "Edit" within ".categories-block"
+    Given display ".button-bar"
+    And I follow "Edit" within ".categories-block"
     And I check "Product"
     And I press "Save"
     Then I should see "Book"
@@ -71,14 +73,16 @@ Feature: categories_block
 
   @selenium
   Scenario: List just general categories
-    Given I follow "Edit" within ".categories-block"
+    Given display ".button-bar"
+    And I follow "Edit" within ".categories-block"
     And I check "Generic category"
     When I press "Save"
     Then I should see "Wood"
 
   @selenium
   Scenario: List just regions
-    Given I follow "Edit" within ".categories-block"
+    Given display ".button-bar"
+    And I follow "Edit" within ".categories-block"
     And I check "Region"
     When I press "Save"
     Then I should see "Bahia"
--
libgit2 0.21.2