diff --git a/app/assets/javascripts/app/models/aspect.js b/app/assets/javascripts/app/models/aspect.js
index 8ae6dac71..ec53e034a 100644
--- a/app/assets/javascripts/app/models/aspect.js
+++ b/app/assets/javascripts/app/models/aspect.js
@@ -1,5 +1,5 @@
 app.models.Aspect = Backbone.Model.extend({
   toggleSelected: function(){
-    this.set({'selected' : !this.get('selected')});
+    this.set({'selected' : !this.get('selected')}, {async: false});
   }
 });
diff --git a/features/support/env.rb b/features/support/env.rb
index c95bb5eab..dca7bceed 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -23,7 +23,7 @@ prefork = proc do
   # Capybara.default_wait_time = 30
 
   # While there are a lot of failures, wait less, avoiding travis timeout
-  Capybara.default_wait_time = 10
+  Capybara.default_wait_time = 15
 
   # If you set this to false, any error raised from within your app will bubble
   # up to your step definition and out to cucumber unless you catch it somewhere
@@ -117,5 +117,5 @@ end
 #   DeferredGarbageCollection.start
 # end
 # After do
-#   DeferredGarbageCollection.reconsider 
+#   DeferredGarbageCollection.reconsider
 # end