diff --git a/features/categories_block.feature b/features/categories_block.feature
index 608cabc..8801e19 100644
--- a/features/categories_block.feature
+++ b/features/categories_block.feature
@@ -29,7 +29,7 @@ Feature: categories_block
   @selenium
   Scenario: List just product categories
     Given display ".button-bar"
-    And I follow "Edit" within ".categories-block"
+    And I follow "Edit" within ".block-outer .categories-block"
     And I check "Product"
     When I press "Save"
     Then I should see "Food"
@@ -41,7 +41,7 @@ Feature: categories_block
   @selenium
   Scenario: Show submenu if it exists
     Given display ".button-bar"
-    And I follow "Edit" within ".categories-block"
+    And I follow "Edit" within ".block-outer .categories-block"
     And I check "Product"
     And I press "Save"
     Then I should see "Food"
@@ -59,7 +59,7 @@ Feature: categories_block
   @selenium
   Scenario: Show only one submenu per time
     Given display ".button-bar"
-    And I follow "Edit" within ".categories-block"
+    And I follow "Edit" within ".block-outer .categories-block"
     And I check "Product"
     And I press "Save"
     Then I should see "Book"
@@ -70,7 +70,7 @@ Feature: categories_block
   @selenium
   Scenario: List just general categories
     Given display ".button-bar"
-    And I follow "Edit" within ".categories-block"
+    And I follow "Edit" within ".block-outer .categories-block"
     And I check "Generic category"
     When I press "Save"
     Then I should see "Wood"
@@ -78,7 +78,7 @@ Feature: categories_block
   @selenium
   Scenario: List just regions
     Given display ".button-bar"
-    And I follow "Edit" within ".categories-block"
+    And I follow "Edit" within ".block-outer .categories-block"
     And I check "Region"
     When I press "Save"
     Then I should see "Bahia"
diff --git a/features/template_block_management.feature b/features/template_block_management.feature
index 00132a0..559e2c7 100644
--- a/features/template_block_management.feature
+++ b/features/template_block_management.feature
@@ -26,7 +26,7 @@ Feature: user template
     Given I am on person's control panel
     And I follow "Edit sideboxes"
     And display ".button-bar"
-    And I follow "Edit" within ".article-block"
+    And I follow "Edit" within ".block-outer .article-block"
     And I fill in "Custom title for this block:" with "Mirror"
     And I press "Save"
     And I go to /profile/mario
@@ -37,7 +37,7 @@ Feature: user template
     Given I am on person's control panel
     And I follow "Edit sideboxes"
     And display ".button-bar"
-    And I follow "Edit" within ".raw-html-block"
+    And I follow "Edit" within ".block-outer .raw-html-block"
     And I fill in "Custom title for this block:" with "Raw HTML Block"
     And I press "Save"
     And I go to /profile/mario
@@ -48,7 +48,7 @@ Feature: user template
     Given I am on person's control panel
     And I follow "Edit sideboxes"
     And display ".button-bar"
-    And I follow "Edit" within ".article-block"
+    And I follow "Edit" within ".block-outer .article-block"
     And I select "Cannot be moved" from "Move options:"
     And I select "Cannot be modified" from "Edit options:"
     And I press "Save"
@@ -61,4 +61,4 @@ Feature: user template
     And I go to /myprofile/mario
     And I follow "Edit sideboxes"
     And display ".button-bar"
-    Then I should not see "Edit" within ".article-block"
+    Then I should not see "Edit" within ".block-outer .article-block"
--
libgit2 0.21.2