diff --git a/Aquaria/DSQ.cpp b/Aquaria/DSQ.cpp
index 91c5f5c..bd38ed7 100644
--- a/Aquaria/DSQ.cpp
+++ b/Aquaria/DSQ.cpp
@@ -673,8 +673,8 @@ void DSQ::debugMenu()
 
 void DSQ::takeScreenshotKey()
 {
-	if (core->getCtrlState() && core->getAltState())
-		takeScreenshot();
+	if (getCtrlState() && getAltState())
+		screenshot();
 }
 
 Quad *loading=0;
@@ -1754,13 +1754,6 @@ void DSQ::toggleRenderCollisionShapes()
 		RenderObject::renderCollisionShape = !RenderObject::renderCollisionShape;
 }
 
-void DSQ::takeScreenshot()
-{
-
-	doScreenshot = true;
-
-}
-
 void DSQ::unloadDevice()
 {
 	destroyFonts();
@@ -3738,6 +3731,11 @@ void DSQ::action(int id, int state, int source)
 			}
 		}
 	}
+
+	if(id == ACTION_SCREENSHOT && state)
+	{
+		screenshot();
+	}
 }
 
 void DSQ::bindInput()
@@ -3759,8 +3757,8 @@ void DSQ::bindInput()
 		addAction(MakeFunctionEvent(DSQ, toggleRenderCollisionShapes), KEY_RETURN, 0);
 	}
 	addAction(MakeFunctionEvent(DSQ, debugMenu), KEY_BACKSPACE, 0);
-	addAction(MakeFunctionEvent(DSQ, takeScreenshot		),		KEY_PRINTSCREEN,	0);
-	addAction(MakeFunctionEvent(DSQ, takeScreenshotKey	),		KEY_P,				0);
+	//addAction(MakeFunctionEvent(DSQ, takeScreenshotKey	),		KEY_P,				0);
+	user.control.actionSet.importAction(this, "Screenshot",		ACTION_SCREENSHOT);
 }
 
 void DSQ::jiggleCursor()
diff --git a/Aquaria/DSQ.h b/Aquaria/DSQ.h
index 1fcdb62..1ab4fa4 100644
--- a/Aquaria/DSQ.h
+++ b/Aquaria/DSQ.h
@@ -323,7 +323,6 @@ public:
 
 	std::string dialogueFile;
 
-	void takeScreenshot();
 	void takeScreenshotKey();
 
 	void generateCollisionMask(RenderObject *r);
diff --git a/Aquaria/GameEnums.h b/Aquaria/GameEnums.h
index 039dd6c..967f1fd 100644
--- a/Aquaria/GameEnums.h
+++ b/Aquaria/GameEnums.h
@@ -110,6 +110,7 @@ enum AquariaActions
 	ACTION_LOOK						,
 	ACTION_TOGGLEHELPSCREEN,
 	ACTION_PLACE_AVATAR,
+	ACTION_SCREENSHOT,
 };
 
 enum AuraType
diff --git a/Aquaria/UserSettings.cpp b/Aquaria/UserSettings.cpp
index 2357595..853ddbc 100644
--- a/Aquaria/UserSettings.cpp
+++ b/Aquaria/UserSettings.cpp
@@ -330,6 +330,7 @@ void UserSettings::load(bool doApply, const std::string &overrideFile)
 	control.actionSet.addActionInput("FoodDrop");
 	control.actionSet.addActionInput("Look");
 	control.actionSet.addActionInput("ToggleHelp");
+	control.actionSet.addActionInput("Screenshot");
 
 	XMLElement *xml_system = doc.FirstChildElement("System");
 	if (xml_system)
diff --git a/files/data/stringbank.txt b/files/data/stringbank.txt
index e108031..3d9e052 100644
--- a/files/data/stringbank.txt
+++ b/files/data/stringbank.txt
@@ -241,6 +241,7 @@
 2129 Song Slot #
 2130 Category
 2131 Mouse
+2132 Take Screenshot
 2150 Movement
 2151 Menu
 2152 Quick Keys
\ No newline at end of file