diff --git a/gui/include/mainwindow.h b/gui/include/mainwindow.h
index f1190de..4112c19 100644
--- a/gui/include/mainwindow.h
+++ b/gui/include/mainwindow.h
@@ -55,6 +55,7 @@ class MainWindow : public QMainWindow
 
 		void UpdateDiscoveryEnabled();
 		void ShowSettings();
+		void Quit();
 
 		void UpdateDisplayServers();
 		void UpdateServerWidgets();
diff --git a/gui/include/streamwindow.h b/gui/include/streamwindow.h
index fd91d13..f3bd8bb 100644
--- a/gui/include/streamwindow.h
+++ b/gui/include/streamwindow.h
@@ -48,6 +48,7 @@ class StreamWindow: public QMainWindow
 		void ToggleFullscreen();
 		void ToggleStretch();
 		void ToggleZoom();
+		void Quit();
 };
 
 #endif // CHIAKI_GUI_STREAMWINDOW_H
diff --git a/gui/src/mainwindow.cpp b/gui/src/mainwindow.cpp
index c3b1b6a..0912b2e 100644
--- a/gui/src/mainwindow.cpp
+++ b/gui/src/mainwindow.cpp
@@ -146,6 +146,11 @@ MainWindow::MainWindow(Settings *settings, QWidget *parent)
 	AddToolBarAction(settings_action);
 	connect(settings_action, &QAction::triggered, this, &MainWindow::ShowSettings);
 
+	auto quit_action = new QAction(tr("Quit"), this);
+	quit_action->setShortcut(Qt::CTRL + Qt::Key_Q);
+	addAction(quit_action);
+	connect(quit_action, &QAction::triggered, this, &MainWindow::Quit);
+
 	auto scroll_area = new QScrollArea(this);
 	scroll_area->setWidgetResizable(true);
 	scroll_area->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
@@ -305,6 +310,11 @@ void MainWindow::ShowSettings()
 	dialog.exec();
 }
 
+void MainWindow::Quit()
+{
+	qApp->exit();
+}
+
 void MainWindow::UpdateDisplayServers()
 {
 	display_servers.clear();
diff --git a/gui/src/streamwindow.cpp b/gui/src/streamwindow.cpp
index d1fc4e8..d1c0b95 100644
--- a/gui/src/streamwindow.cpp
+++ b/gui/src/streamwindow.cpp
@@ -102,6 +102,11 @@ void StreamWindow::Init()
 	addAction(zoom_action);
 	connect(zoom_action, &QAction::triggered, this, &StreamWindow::ToggleZoom);
 
+	auto quit_action = new QAction(tr("Quit"), this);
+	quit_action->setShortcut(Qt::CTRL + Qt::Key_Q);
+	addAction(quit_action);
+	connect(quit_action, &QAction::triggered, this, &StreamWindow::Quit);
+
 	resize(connect_info.video_profile.width, connect_info.video_profile.height);
 
 	if(connect_info.fullscreen)
@@ -127,6 +132,11 @@ void StreamWindow::keyReleaseEvent(QKeyEvent *event)
 		session->HandleKeyboardEvent(event);
 }
 
+void StreamWindow::Quit()
+{
+	close();
+}
+
 void StreamWindow::mousePressEvent(QMouseEvent *event)
 {
 	if(session && session->HandleMouseEvent(event))