diff --git a/src/com/limelight/gui/MainFrame.java b/src/com/limelight/gui/MainFrame.java
index a2e8eb5..61896ba 100644
--- a/src/com/limelight/gui/MainFrame.java
+++ b/src/com/limelight/gui/MainFrame.java
@@ -28,6 +28,7 @@ import org.xmlpull.v1.XmlPullParserException;
 
 import com.limelight.Limelight;
 import com.limelight.binding.PlatformBinding;
+import com.limelight.input.gamepad.NativeGamepad;
 import com.limelight.nvstream.NvConnection;
 import com.limelight.nvstream.http.NvHTTP;
 import com.limelight.settings.PreferencesManager;
@@ -62,6 +63,10 @@ public class MainFrame {
 			@Override
 			public void windowClosing(WindowEvent e) {
 				super.windowClosing(e);
+				if (NativeGamepad.isRunning()) {
+					NativeGamepad.stop();
+				}
+				
 			}
 		});
 		Container mainPane = limeFrame.getContentPane();