diff --git a/src/main/java/solitaer/MyMouseListener.java b/src/main/java/solitaer/MyMouseListener.java
index d222ac6..0ad21bb 100644
--- a/src/main/java/solitaer/MyMouseListener.java
+++ b/src/main/java/solitaer/MyMouseListener.java
@@ -118,6 +118,11 @@ public class MyMouseListener implements MouseInputListener {
 			} else {
 				tempStack = (GeberStack) com.getParent();
 			}
+			
+			if(this.saveStack.stackIsEmpty() == false) {
+				clearSaveStack(selectedStack);
+			}
+			
 			if (tempStack.stackIsEmpty()) {
 				// Move all from Waste to Geber
 				((GeberStack) this.tempStack).swapWasteGeber();