diff --git a/src/imageviewwidget.cpp b/src/imageviewwidget.cpp
index f11b721..44e837c 100644
--- a/src/imageviewwidget.cpp
+++ b/src/imageviewwidget.cpp
@@ -73,7 +73,7 @@ void ImageViewWidget::paintEvent(QPaintEvent *)
 
 void ImageViewWidget::keyPressEvent(QKeyEvent *event)
 {
-    if (event->key() == Qt::Key_Escape)
+    if (event->key() == Qt::Key_Escape || event->key() == Qt::Key_Return || event->key() == Qt::Key_Enter)
     {
         emit closeRequested();
         event->accept();
@@ -226,6 +226,14 @@ void ImageViewWidget::mouseReleaseEvent(QMouseEvent *event)
     }
 }
 
+void ImageViewWidget::mouseDoubleClickEvent(QMouseEvent *event)
+{
+    if (event->button() == Qt::LeftButton) {
+        emit closeRequested();
+        event->accept();
+    }
+}
+
 void ImageViewWidget::clampOffset(int imgW, int imgH)
 {
     // Only allow panning when the drawn image exceeds the widget
diff --git a/src/imageviewwidget.h b/src/imageviewwidget.h
index 518591e..201d498 100644
--- a/src/imageviewwidget.h
+++ b/src/imageviewwidget.h
@@ -33,6 +33,7 @@ protected:
     void mousePressEvent(QMouseEvent *event) override;
     void mouseMoveEvent(QMouseEvent *event) override;
     void mouseReleaseEvent(QMouseEvent *event) override;
+    void mouseDoubleClickEvent(QMouseEvent *event) override;
 
 private:
     void clampOffset(int imgW, int imgH);