diff --git a/CHANGES b/CHANGES
index eaf6bff2b..e274ccf02 100644
--- a/CHANGES
+++ b/CHANGES
@@ -85,6 +85,7 @@ Misc:
  - GBA: Move A/V stream interface into core
  - GBA: Savestates now take into account savedata state machines (fixes #109)
  - Qt: Remember window position
+ - Qt: Double-clicking on the window toggles full screen
 
 0.1.1: (2015-01-24)
 Bugfixes:
diff --git a/src/platform/qt/Window.cpp b/src/platform/qt/Window.cpp
index 9d2f0efe8..732270c0b 100644
--- a/src/platform/qt/Window.cpp
+++ b/src/platform/qt/Window.cpp
@@ -385,6 +385,13 @@ void Window::dropEvent(QDropEvent* event) {
 	m_controller->loadGame(url.path());
 }
 
+void Window::mouseDoubleClickEvent(QMouseEvent* event) {
+	if (event->button() != Qt::LeftButton) {
+		return;
+	}
+	toggleFullScreen();
+}
+
 void Window::enterFullScreen() {
 	if (isFullScreen()) {
 		return;
diff --git a/src/platform/qt/Window.h b/src/platform/qt/Window.h
index 85a3f1907..ac1b5f688 100644
--- a/src/platform/qt/Window.h
+++ b/src/platform/qt/Window.h
@@ -97,6 +97,7 @@ protected:
 	virtual void focusOutEvent(QFocusEvent*) override;
 	virtual void dragEnterEvent(QDragEnterEvent*) override;
 	virtual void dropEvent(QDropEvent*) override;
+	virtual void mouseDoubleClickEvent(QMouseEvent*) override;
 
 private slots:
 	void gameStarted(GBAThread*);