diff --git a/source/frontend/start.cpp b/source/frontend/start.cpp
index 166daab2b..3d86ae268 100644
--- a/source/frontend/start.cpp
+++ b/source/frontend/start.cpp
@@ -104,14 +104,14 @@
 
 const int CFrontEndStart::s_itemFrames[]=
 {
-	FRM_BLOWER,		// SHOPITEM_BLOWER
-	FRM_CAKE,		// SHOPITEM_CAKE
-	FRM_CUPCAKE,	// SHOPITEM_CUPCAKE
-	FRM_JELLY2,		// SHOPITEM_JELLY2
-	FRM_PARTYHAT,	// SHOPITEM_PARTYHAT
-	FRM_PREZZIE,	// SHOPITEM_PREZZIE
-	FRM_SARNIE,		// SHOPITEM_SARNIE
 	FRM_TEDDY,		// SHOPITEM_TEDDY
+	FRM_SARNIE,		// SHOPITEM_SARNIE
+	FRM_CUPCAKE,	// SHOPITEM_CUPCAKE
+	FRM_PREZZIE,	// SHOPITEM_PREZZIE
+	FRM_JELLY2,		// SHOPITEM_JELLY2
+	FRM_CAKE,		// SHOPITEM_CAKE
+	FRM_BLOWER,		// SHOPITEM_BLOWER
+	FRM_PARTYHAT,	// SHOPITEM_PARTYHAT
 };
 
 
diff --git a/source/shop/shop.cpp b/source/shop/shop.cpp
index 32768c58f..b5a2c8e74 100644
--- a/source/shop/shop.cpp
+++ b/source/shop/shop.cpp
@@ -121,14 +121,14 @@
 // 125 tokens in total
 CShopScene::SHOPITEM	CShopScene::s_shopItems[NUM_SHOP_ITEM_IDS]=
 {
-	{	 5,	FRM_TEDDY		},
-	{	 8,	FRM_SARNIE		},
-	{	10,	FRM_CUPCAKE		},
-	{	12,	FRM_PREZZIE		},
-	{	16,	FRM_JELLY2		},
-	{	20,	FRM_CAKE		},
-	{	24,	FRM_BLOWER		},
-	{	30,	FRM_PARTYHAT	},
+	{	 5,	FRM_TEDDY		},			// SHOPITEM_TEDDY
+	{	 8,	FRM_SARNIE		},			// SHOPITEM_SARNIE
+	{	10,	FRM_CUPCAKE		},			// SHOPITEM_CUPCAKE
+	{	12,	FRM_PREZZIE		},			// SHOPITEM_PREZZIE
+	{	16,	FRM_JELLY2		},			// SHOPITEM_JELLY2
+	{	20,	FRM_CAKE		},			// SHOPITEM_CAKE
+	{	24,	FRM_BLOWER		},			// SHOPITEM_BLOWER
+	{	30,	FRM_PARTYHAT	},			// SHOPITEM_PARTYHAT
 };
 
 xmPlayingId	s_playId;
diff --git a/source/shop/shop.h b/source/shop/shop.h
index 38ac102ae..3b76f63b8 100644
--- a/source/shop/shop.h
+++ b/source/shop/shop.h
@@ -52,14 +52,15 @@ public:
 
 	typedef enum
 	{
-		SHOPITEM_BLOWER,
-		SHOPITEM_CAKE,
-		SHOPITEM_CUPCAKE,
-		SHOPITEM_JELLY2,
-		SHOPITEM_PARTYHAT,
-		SHOPITEM_PREZZIE,
-		SHOPITEM_SARNIE,
 		SHOPITEM_TEDDY,
+		SHOPITEM_SARNIE,
+		SHOPITEM_CUPCAKE,
+		SHOPITEM_PREZZIE,
+		SHOPITEM_JELLY2,
+		SHOPITEM_CAKE,
+		SHOPITEM_BLOWER,
+		SHOPITEM_PARTYHAT,
+
 		NUM_SHOP_ITEM_IDS
 	} SHOPITEM_ID;
 
diff --git a/source/system/gstate.cpp b/source/system/gstate.cpp
index 7ec25257f..750087020 100644
--- a/source/system/gstate.cpp
+++ b/source/system/gstate.cpp
@@ -139,10 +139,24 @@ void GameState::render()
 /*****************************************************************************/
 /*****************************************************************************/
 /*****************************************************************************/
+// Define this to make the game go to the scene selecter after every scene
+//#define _ALWAYS_GO_BACK_TO_THE_SCENE_SELECTER_
+
+#ifdef _ALWAYS_GO_BACK_TO_THE_SCENE_SELECTER_
+#include "paul\scenesel.h"
+#endif
+
 void GameState::setNextScene( CScene *_nextScene )
 {
 	ASSERT(!s_pendingScene);
 
+#ifdef _ALWAYS_GO_BACK_TO_THE_SCENE_SELECTER_
+	if(s_currentScene!=&SceneSelector)
+	{
+		_nextScene=&SceneSelector;
+	}
+#endif
+
 	s_pendingScene=_nextScene;
 }