diff --git a/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryGraveyardPutInHandEffect.java b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryGraveyardPutInHandEffect.java
index 15042461cbc..ce9a090df11 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryGraveyardPutInHandEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryGraveyardPutInHandEffect.java
@@ -55,6 +55,7 @@ public class SearchLibraryGraveyardPutInHandEffect extends OneShotEffect {
         Player controller = game.getPlayer(source.getControllerId());
         MageObject sourceObject = source.getSourceObject(game);
         Card cardFound = null;
+        boolean needShuffle = false;
         if (controller != null && sourceObject != null) {
             if (forceToSearchBoth || controller.chooseUse(outcome, "Search your library for a card named " + filter.getMessage() + '?', source, game)) {
                 TargetCardInLibrary target = new TargetCardInLibrary(0, 1, filter);
@@ -64,7 +65,7 @@ public class SearchLibraryGraveyardPutInHandEffect extends OneShotEffect {
                         cardFound = game.getCard(target.getFirstTarget());
                     }
                 }
-                controller.shuffleLibrary(source, game);
+                needShuffle = true;
             }
 
             if (cardFound == null && controller.chooseUse(outcome, "Search your graveyard for a card named " + filter.getMessage() + '?', source, game)) {
@@ -82,6 +83,10 @@ public class SearchLibraryGraveyardPutInHandEffect extends OneShotEffect {
                 controller.moveCards(cardFound, Zone.HAND, source, game);
             }
 
+            if (needShuffle) {
+                controller.shuffleLibrary(source, game);
+            }
+
             return true;
         }
 
diff --git a/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryGraveyardPutOntoBattlefieldEffect.java b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryGraveyardPutOntoBattlefieldEffect.java
index 726eec7a1e4..90fefbc79f1 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryGraveyardPutOntoBattlefieldEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryGraveyardPutOntoBattlefieldEffect.java
@@ -53,6 +53,7 @@ public class SearchLibraryGraveyardPutOntoBattlefieldEffect extends OneShotEffec
         Player controller = game.getPlayer(source.getControllerId());
         MageObject sourceObject = source.getSourceObject(game);
         Card cardFound = null;
+        boolean needShuffle = false;
         if (controller != null && sourceObject != null) {
             if (forceToSearchBoth || controller.chooseUse(outcome, "Search your library for a " + filter.getMessage() + '?', source, game)) {
                 TargetCardInLibrary target = new TargetCardInLibrary(0, 1, filter);
@@ -62,7 +63,7 @@ public class SearchLibraryGraveyardPutOntoBattlefieldEffect extends OneShotEffec
                         cardFound = game.getCard(target.getFirstTarget());
                     }
                 }
-                controller.shuffleLibrary(source, game);
+                needShuffle = true;
             }
 
             if (cardFound == null && controller.chooseUse(outcome, "Search your graveyard for a " + filter.getMessage() + '?', source, game)) {
@@ -79,6 +80,10 @@ public class SearchLibraryGraveyardPutOntoBattlefieldEffect extends OneShotEffec
                 controller.moveCards(cardFound, Zone.BATTLEFIELD, source, game);
             }
 
+            if (needShuffle) {
+                controller.shuffleLibrary(source, game);
+            }
+
             return true;
         }