diff --git a/www/plan/plan.js b/www/plan/plan.js
index 6288b4d..242fded 100644
--- a/www/plan/plan.js
+++ b/www/plan/plan.js
@@ -72,12 +72,15 @@ class Store {
 
             if($(ev.currentTarget).hasClass('planningState')){
                 this.setState('planning');
+                this.selector.find(".newItemName").first().focus();
             }
             else if($(ev.currentTarget).hasClass('shoppingState')){
                 this.setState('shopping');
+                this.selector.find(".checkItems input").first().focus();
             }
             else if($(ev.currentTarget).hasClass('closedState')){
                 this.setState('closed');
+                this.selector.find(".removeStore").first().focus();
             }
         });
 
@@ -100,7 +103,7 @@ class Store {
             this.state = "planning";
             this.selector.find('li:not(.checkedItem) .itemAmountButtons').slideDown(animTime);
             this.selector.find('li:not(.checkedItem) .itemAmountText').slideUp(animTime);
-            this.selector.find('.checkedItem .itemAmountText').slideDown(animTime);
+            this.selector.find('.checkedItem .itemAmountText:not(.oneItem)').slideDown(animTime);
 
             this.selector.find('.addItemFormWrapper').slideDown(animTime);
             this.selector.find('.remItem').show();