diff --git a/Mage.Client/src/main/java/mage/client/cards/CardEventSource.java b/Mage.Client/src/main/java/mage/client/cards/CardEventSource.java
index ffef6ad0f22..7fab2ae91c9 100644
--- a/Mage.Client/src/main/java/mage/client/cards/CardEventSource.java
+++ b/Mage.Client/src/main/java/mage/client/cards/CardEventSource.java
@@ -52,6 +52,10 @@ public class CardEventSource implements EventSource<Event>, Serializable {
 		dispatcher.fireEvent(new Event(cardId, message));
 	}
 
+	public void shiftDoubleClick(UUID cardId, String message) {
+		dispatcher.fireEvent(new Event(cardId, message));
+	}
+
 	@Override
 	public void clearListeners() {
 		dispatcher.clearListeners();
diff --git a/Mage.Client/src/main/java/mage/client/cards/CardsList.form b/Mage.Client/src/main/java/mage/client/cards/CardsList.form
index 918e86575b4..f7a44c79007 100644
--- a/Mage.Client/src/main/java/mage/client/cards/CardsList.form
+++ b/Mage.Client/src/main/java/mage/client/cards/CardsList.form
@@ -27,7 +27,7 @@
     <DimensionLayout dim="0">
       <Group type="103" groupAlignment="0" attributes="0">
           <Component id="jPanel1" alignment="0" max="32767" attributes="0"/>
-          <Component id="jScrollPane1" alignment="0" pref="636" max="32767" attributes="0"/>
+          <Component id="jScrollPane1" alignment="0" pref="325" max="32767" attributes="0"/>
       </Group>
     </DimensionLayout>
     <DimensionLayout dim="1">
@@ -35,7 +35,7 @@
           <Group type="102" attributes="0">
               <Component id="jPanel1" min="-2" max="-2" attributes="0"/>
               <EmptySpace min="-2" pref="0" max="-2" attributes="0"/>
-              <Component id="jScrollPane1" pref="366" max="32767" attributes="0"/>
+              <Component id="jScrollPane1" pref="23" max="32767" attributes="0"/>
           </Group>
       </Group>
     </DimensionLayout>
diff --git a/Mage.Client/src/main/java/mage/client/cards/CardsList.java b/Mage.Client/src/main/java/mage/client/cards/CardsList.java
index 8ae8daaeec0..c930ec76c34 100644
--- a/Mage.Client/src/main/java/mage/client/cards/CardsList.java
+++ b/Mage.Client/src/main/java/mage/client/cards/CardsList.java
@@ -314,9 +314,15 @@ public class CardsList extends javax.swing.JPanel implements MouseListener {
 			e.consume();
 			Object obj = e.getSource();
 			if (obj instanceof Card) {
-				cardEventSource.doubleClick(((Card)obj).getCardId(), "double-click");
+				if (e.isShiftDown())
+					cardEventSource.shiftDoubleClick(((Card)obj).getCardId(), "shift-double-click");
+				else
+					cardEventSource.doubleClick(((Card)obj).getCardId(), "double-click");
 			} else if (obj instanceof MageCard) {
-				cardEventSource.doubleClick(((MageCard)obj).getOriginal().getId(), "double-click");
+				if (e.isShiftDown())
+					cardEventSource.shiftDoubleClick(((MageCard)obj).getOriginal().getId(), "shift-double-click");
+				else
+					cardEventSource.doubleClick(((MageCard)obj).getOriginal().getId(), "double-click");
 			}
 		}
 	}
diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java b/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java
index fbad20489be..8b0188716a1 100644
--- a/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java
+++ b/Mage.Client/src/main/java/mage/client/deckeditor/DeckEditorPanel.java
@@ -187,6 +187,33 @@ public class DeckEditorPanel extends javax.swing.JPanel {
 						}
 						refreshDeck();
 					}
+					else if (event.getEventName().equals("shift-double-click") && mode == DeckEditorMode.Constructed) {
+						for (Card card: deck.getCards()) {
+							if (card.getId().equals((UUID)event.getSource())) {
+								deck.getCards().remove(card);
+								deck.getSideboard().add(card);
+								break;
+							}
+						}
+						refreshDeck();
+					}
+				}
+			}
+		);
+		this.deckArea.addSideboardEventListener(
+			new Listener<Event> () {
+				@Override
+				public void event(Event event) {
+					if (event.getEventName().equals("double-click")) {
+						for (Card card: deck.getSideboard()) {
+							if (card.getId().equals((UUID)event.getSource())) {
+								deck.getSideboard().remove(card);
+								deck.getCards().add(card);
+								break;
+							}
+						}
+						refreshDeck();
+					}
 				}
 			}
 		);