diff --git a/source/common/gamecvars.cpp b/source/common/gamecvars.cpp
index 1654bff04..5f660e435 100644
--- a/source/common/gamecvars.cpp
+++ b/source/common/gamecvars.cpp
@@ -272,7 +272,6 @@ CUSTOM_CVARD(Int, r_fov, 90, CVAR_ARCHIVE|CVAR_GLOBALCONFIG, "change the field o
 
 CVARD(Bool, r_horizcenter, false, CVAR_ARCHIVE|CVAR_FRONTEND_BLOOD, "enable/disable centered horizon line") // only present in Blood, maybe add to others?
 
-CVARD(Bool, in_joystick, false, CVAR_ARCHIVE||CVAR_GLOBALCONFIG|CVAR_NOINITCALL, "enables input from the joystick if it is present")
 CVARD(Bool, in_mousemode, true, CVAR_ARCHIVE|CVAR_GLOBALCONFIG, "toggles vertical mouse view")
 
 CVAR(Bool, silentmouseaimtoggle, false, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
diff --git a/source/common/gamecvars.h b/source/common/gamecvars.h
index b2beea32c..13bf7c48b 100644
--- a/source/common/gamecvars.h
+++ b/source/common/gamecvars.h
@@ -85,7 +85,7 @@ EXTERN_CVAR(Float, vid_brightness)
 EXTERN_CVAR(Int, gl_multisample)
 EXTERN_CVAR(Int, gl_ssao)
 
-EXTERN_CVAR(Bool, in_joystick)
+EXTERN_CVAR(Bool, use_joystick)
 EXTERN_CVAR(Int, in_mousebias)
 EXTERN_CVAR(Bool, in_mouseflip)
 EXTERN_CVAR(Bool, in_mousemode)
diff --git a/source/common/input/m_joy.cpp b/source/common/input/m_joy.cpp
index bcdb429d0..054bceca7 100644
--- a/source/common/input/m_joy.cpp
+++ b/source/common/input/m_joy.cpp
@@ -50,17 +50,15 @@
 
 // EXTERNAL DATA DECLARATIONS ----------------------------------------------
 
-#if 0
 EXTERN_CVAR(Bool, joy_ps2raw)
 EXTERN_CVAR(Bool, joy_dinput)
 EXTERN_CVAR(Bool, joy_xinput)
-#endif
 
 // PUBLIC DATA DEFINITIONS -------------------------------------------------
 
-CUSTOM_CVAR(Bool, use_joystick, false, CVAR_ARCHIVE|CVAR_GLOBALCONFIG|CVAR_NOINITCALL)
+CUSTOM_CVARD(Bool, use_joystick, false, CVAR_ARCHIVE|CVAR_GLOBALCONFIG|CVAR_NOINITCALL, "enables input from the joystick if it is present") 
 {
-#if 0//def _WIN32
+#ifdef _WIN32
 	joy_ps2raw.Callback();
 	joy_dinput.Callback();
 	joy_xinput.Callback();
diff --git a/source/common/inputstate.cpp b/source/common/inputstate.cpp
index 675ea4116..2c72520ea 100644
--- a/source/common/inputstate.cpp
+++ b/source/common/inputstate.cpp
@@ -187,7 +187,7 @@ void CONTROL_GetInput(ControlInfo* info)
 
 	inputState.GetMouseDelta(info);
 
-	if (in_joystick)
+	if (use_joystick)
 	{
 		// Handle joysticks/game controllers.
 		float joyaxes[NUM_JOYAXIS];