diff --git a/src/soon/PowerOff.java b/src/soon/PowerOff.java
index 0bca94367cfd5e8e958d6845c1e7a6bc0e07ad67..2643e779ec328cda517a11c21e63c84e7858f1e1 100644
--- a/src/soon/PowerOff.java
+++ b/src/soon/PowerOff.java
@@ -7,7 +7,8 @@ public class PowerOff extends Zustand {
 	}
 	
 	public void powerButton() {
-		s.setZustand(s.getStopZustand());
+		exit();
+		s.setZustand(s.getPowerOnHistory());
 		System.out.println("Anschalten");
-	}
+		s.getZustand().entry();	}
 }
diff --git a/src/soon/PowerOn.java b/src/soon/PowerOn.java
index 545bd856e2a7b841025cd7ebde0cfb2730559df2..de675f1ad5a85a24bdd10ea1e6c08aba8fec94a5 100644
--- a/src/soon/PowerOn.java
+++ b/src/soon/PowerOn.java
@@ -7,6 +7,8 @@ public abstract class PowerOn extends Zustand {
 	}
 	
 	public void powerButton() {
+		exit();
+		s.setPowerOnHistory(s.getZustand());
 		s.setZustand(s.getPowerOffZustand());
 		System.out.println("Ausschalten");
 	}
diff --git a/src/soon/Soon.java b/src/soon/Soon.java
index 201c7b69229df6b8406a38319ba09d2b7913e947..bbfaadab452f083e06e865a9e4e9e9ccd227227d 100644
--- a/src/soon/Soon.java
+++ b/src/soon/Soon.java
@@ -4,6 +4,7 @@ public class Soon {
 	Zustand stopZustand;
 	Zustand playZustand;
 	Zustand powerOffZustand;
+	Zustand powerOnHistory;
 	
 	Zustand zustand;
 	
@@ -12,6 +13,7 @@ public class Soon {
 		playZustand = new PlayZustand(this);
 		powerOffZustand = new PowerOff(this);
 		zustand = powerOffZustand;
+		powerOnHistory = stopZustand;
 	}
 
 	public Zustand getPowerOffZustand() {
@@ -69,6 +71,14 @@ public class Soon {
 	public void volumeDown() {
 		System.out.println("Leiser");
 	}
+	
+	public Zustand getPowerOnHistory() {
+		return powerOnHistory;
+	}
+	
+	public void setPowerOnHistory(Zustand z) {
+		powerOnHistory = z;
+	}
 
 	public String toString() {
 		StringBuffer result = new StringBuffer();
diff --git a/src/soon/SoonTestDrive.java b/src/soon/SoonTestDrive.java
index 7e3fc47a1fa5124ea45a60f906e09080258acd3c..991af0bee6ea248abed10db74636104d36893a3a 100644
--- a/src/soon/SoonTestDrive.java
+++ b/src/soon/SoonTestDrive.java
@@ -10,6 +10,8 @@ public class SoonTestDrive {
 		player.powerButton();
 		player.playButton();
 		player.volumeUpButton();
+		player.powerButton();
+		player.powerButton();
 		player.volumeDownButton();
 		player.stopButton();
 		player.powerButton();