diff --git a/features/project_edit.feature b/features/project_edit.feature
index 07865591..e59eb501 100644
--- a/features/project_edit.feature
+++ b/features/project_edit.feature
@@ -101,7 +101,7 @@ Feature: Edit a project
     And I cancel adding a note to the project
     Then the form for adding a note should not be visible
 
-  @javascript @wip
+  @javascript
   Scenario: Long notes in a project are shown cut off
     Given I have a project called "test"
     When I go to the "test" project
diff --git a/features/step_definitions/generic_steps.rb b/features/step_definitions/generic_steps.rb
index 1cb1d3b3..343bc310 100644
--- a/features/step_definitions/generic_steps.rb
+++ b/features/step_definitions/generic_steps.rb
@@ -17,6 +17,8 @@ end
 
 Then /^I should see an error flash message saying "([^"]*)"$/ do |message|
   xpath = "//div[@id='message_holder']/h4[@id='flash']"
+  page.should have_xpath(xpath, :visible => true)
+  
   text = page.find(:xpath, xpath).text
   text.should == message
 end
diff --git a/features/step_definitions/project_steps.rb b/features/step_definitions/project_steps.rb
index caafbf9b..07845519 100644
--- a/features/step_definitions/project_steps.rb
+++ b/features/step_definitions/project_steps.rb
@@ -272,6 +272,8 @@ end
 
 Then /^I should (see|not see) the default project settings$/ do |visible|
   default_settings = "This project is active with no default context and with no default tags"
+
+  page.should have_css("div.project_settings")
   elem = page.find("div.project_settings")
   
   if visible == "see"