diff --git a/CHANGELOG.md b/CHANGELOG.md
index a6dcc846..1657c86c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,8 @@
 4.7.17
 ========================
 * Fixed Cam4 pages
+* Fixed tray icon bug where the GUI would not open again, if it was minimized
+  by clicking in the tray icon
 
 4.7.16
 ========================
diff --git a/client/src/main/java/ctbrec/ui/TrayIcon.java b/client/src/main/java/ctbrec/ui/TrayIcon.java
index 926980f0..133cac10 100644
--- a/client/src/main/java/ctbrec/ui/TrayIcon.java
+++ b/client/src/main/java/ctbrec/ui/TrayIcon.java
@@ -123,6 +123,7 @@ public class TrayIcon {
 
     private void toggleVisibility(Stage stage) {
         if (stage.isShowing()) {
+            Platform.setImplicitExit(false);
             Platform.runLater(stage::hide);
         } else {
             restoreStage(stage);