diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html b/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html
index 715dda076..51636bbbc 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html
@@ -9,6 +9,7 @@
 - "Troll Knife" now correctly costs 2.
 - Changed Hobbit format's deck building restrictions and they are now displayed in the formats.
 - "Dawn Take You All" now correctly works during Skirmish.
+- "Wizard Staff" now correctly takes a card from deck (not discard) into hand, also shuffles the deck afterwards.
 
 <b>17 Dec. 2015</b>
 - "Armor of Khazad" no longer allows to return itself from discard and can now be transferred.
diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gandalf/Card31_018.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gandalf/Card31_018.java
index 34f7bf148..ac4f7467c 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gandalf/Card31_018.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/gandalf/Card31_018.java
@@ -4,6 +4,8 @@ import com.gempukku.lotro.cards.AbstractAttachableFPPossession;
 import com.gempukku.lotro.cards.TriggerConditions;
 import com.gempukku.lotro.cards.effects.ExertCharactersEffect;
 import com.gempukku.lotro.cards.effects.PutCardFromDiscardIntoHandEffect;
+import com.gempukku.lotro.cards.effects.ShuffleDeckEffect;
+import com.gempukku.lotro.cards.effects.choose.ChooseAndPutCardFromDeckIntoHandEffect;
 import com.gempukku.lotro.cards.effects.choose.ChooseOpponentEffect;
 import com.gempukku.lotro.common.*;
 import com.gempukku.lotro.filters.Filters;
@@ -45,15 +47,9 @@ public class Card31_018 extends AbstractAttachableFPPossession {
             final OptionalTriggerAction action = new OptionalTriggerAction(self);
 			action.appendCost(new ExertCharactersEffect(action, self, self.getAttachedTo()));
             action.appendEffect(
-                    new ChooseArbitraryCardsEffect(playerId, "Choose GANDALF spell", game.getGameState().getDiscard(playerId), Filters.and(Culture.GANDALF, Keyword.SPELL), 1, 1) {
-                        @Override
-                        protected void cardsSelected(LotroGame game, Collection<PhysicalCard> selectedCards) {
-                            for (PhysicalCard selectedCard : selectedCards) {
-                                action.appendEffect(
-                                        new PutCardFromDiscardIntoHandEffect(selectedCard));
-                            }
-                        }
-            });
+                    new ChooseAndPutCardFromDeckIntoHandEffect(action, playerId, 1, 1, Culture.GANDALF, Keyword.SPELL));
+            action.appendEffect(
+                    new ShuffleDeckEffect(playerId));
             return Collections.singletonList(action);
         }
         return null;