diff --git a/gotify_tray/gui/designs/widget_settings.py b/gotify_tray/gui/designs/widget_settings.py
index 7dd9190..fe511fd 100644
--- a/gotify_tray/gui/designs/widget_settings.py
+++ b/gotify_tray/gui/designs/widget_settings.py
@@ -12,7 +12,7 @@ from PyQt6 import QtCore, QtGui, QtWidgets
 class Ui_Dialog(object):
     def setupUi(self, Dialog):
         Dialog.setObjectName("Dialog")
-        Dialog.resize(384, 300)
+        Dialog.resize(384, 277)
         self.gridLayout = QtWidgets.QGridLayout(Dialog)
         self.gridLayout.setObjectName("gridLayout")
         self.buttonBox = QtWidgets.QDialogButtonBox(Dialog)
@@ -114,25 +114,26 @@ class Ui_Dialog(object):
         self.pb_export.setObjectName("pb_export")
         self.horizontalLayout_2.addWidget(self.pb_export)
         self.verticalLayout.addWidget(self.groupBox)
-        self.groupBox_2 = QtWidgets.QGroupBox(self.tab_advanced)
-        self.groupBox_2.setObjectName("groupBox_2")
-        self.gridLayout_2 = QtWidgets.QGridLayout(self.groupBox_2)
+        self.groupbox_image_popup = QtWidgets.QGroupBox(self.tab_advanced)
+        self.groupbox_image_popup.setCheckable(True)
+        self.groupbox_image_popup.setObjectName("groupbox_image_popup")
+        self.gridLayout_2 = QtWidgets.QGridLayout(self.groupbox_image_popup)
         self.gridLayout_2.setObjectName("gridLayout_2")
         self.horizontalLayout_4 = QtWidgets.QHBoxLayout()
         self.horizontalLayout_4.setObjectName("horizontalLayout_4")
-        self.label = QtWidgets.QLabel(self.groupBox_2)
+        self.label = QtWidgets.QLabel(self.groupbox_image_popup)
         self.label.setObjectName("label")
         self.horizontalLayout_4.addWidget(self.label)
-        self.spin_popup_w = QtWidgets.QSpinBox(self.groupBox_2)
+        self.spin_popup_w = QtWidgets.QSpinBox(self.groupbox_image_popup)
         self.spin_popup_w.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter)
         self.spin_popup_w.setMinimum(100)
         self.spin_popup_w.setMaximum(10000)
         self.spin_popup_w.setObjectName("spin_popup_w")
         self.horizontalLayout_4.addWidget(self.spin_popup_w)
-        self.label_2 = QtWidgets.QLabel(self.groupBox_2)
+        self.label_2 = QtWidgets.QLabel(self.groupbox_image_popup)
         self.label_2.setObjectName("label_2")
         self.horizontalLayout_4.addWidget(self.label_2)
-        self.spin_popup_h = QtWidgets.QSpinBox(self.groupBox_2)
+        self.spin_popup_h = QtWidgets.QSpinBox(self.groupbox_image_popup)
         self.spin_popup_h.setAlignment(QtCore.Qt.AlignmentFlag.AlignCenter)
         self.spin_popup_h.setMinimum(100)
         self.spin_popup_h.setMaximum(10000)
@@ -140,11 +141,8 @@ class Ui_Dialog(object):
         self.horizontalLayout_4.addWidget(self.spin_popup_h)
         spacerItem4 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
         self.horizontalLayout_4.addItem(spacerItem4)
-        self.gridLayout_2.addLayout(self.horizontalLayout_4, 1, 0, 1, 1)
-        self.cb_image_popup = QtWidgets.QCheckBox(self.groupBox_2)
-        self.cb_image_popup.setObjectName("cb_image_popup")
-        self.gridLayout_2.addWidget(self.cb_image_popup, 0, 0, 1, 1)
-        self.verticalLayout.addWidget(self.groupBox_2)
+        self.gridLayout_2.addLayout(self.horizontalLayout_4, 0, 0, 1, 1)
+        self.verticalLayout.addWidget(self.groupbox_image_popup)
         self.groupBox_logging = QtWidgets.QGroupBox(self.tab_advanced)
         self.groupBox_logging.setObjectName("groupBox_logging")
         self.gridLayout_6 = QtWidgets.QGridLayout(self.groupBox_logging)
@@ -200,14 +198,13 @@ class Ui_Dialog(object):
         self.pb_reset.setText(_translate("Dialog", "Reset"))
         self.pb_import.setText(_translate("Dialog", "Import"))
         self.pb_export.setText(_translate("Dialog", "Export"))
-        self.groupBox_2.setTitle(_translate("Dialog", "Image pop-up"))
+        self.groupbox_image_popup.setTitle(_translate("Dialog", "Image pop-up for URLs"))
         self.label.setToolTip(_translate("Dialog", "Maximum pop-up width"))
         self.label.setText(_translate("Dialog", "Width"))
         self.spin_popup_w.setToolTip(_translate("Dialog", "Maximum pop-up width"))
         self.label_2.setToolTip(_translate("Dialog", "Maximum pop-up height"))
         self.label_2.setText(_translate("Dialog", "Height"))
         self.spin_popup_h.setToolTip(_translate("Dialog", "Maximum pop-up height"))
-        self.cb_image_popup.setText(_translate("Dialog", "Show an image pop-up when hovering over image URLs"))
         self.groupBox_logging.setTitle(_translate("Dialog", "Logging"))
         self.pb_open_log.setToolTip(_translate("Dialog", "Open logfile"))
         self.pb_open_log.setText(_translate("Dialog", "..."))
diff --git a/gotify_tray/gui/designs/widget_settings.ui b/gotify_tray/gui/designs/widget_settings.ui
index fa9e1d1..79c7fdc 100644
--- a/gotify_tray/gui/designs/widget_settings.ui
+++ b/gotify_tray/gui/designs/widget_settings.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>384</width>
-    <height>300</height>
+    <height>277</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -259,12 +259,15 @@
         </widget>
        </item>
        <item>
-        <widget class="QGroupBox" name="groupBox_2">
+        <widget class="QGroupBox" name="groupbox_image_popup">
          <property name="title">
-          <string>Image pop-up</string>
+          <string>Image pop-up for URLs</string>
+         </property>
+         <property name="checkable">
+          <bool>true</bool>
          </property>
          <layout class="QGridLayout" name="gridLayout_2">
-          <item row="1" column="0">
+          <item row="0" column="0">
            <layout class="QHBoxLayout" name="horizontalLayout_4">
             <item>
              <widget class="QLabel" name="label">
@@ -333,13 +336,6 @@
             </item>
            </layout>
           </item>
-          <item row="0" column="0">
-           <widget class="QCheckBox" name="cb_image_popup">
-            <property name="text">
-             <string>Show an image pop-up when hovering over image URLs</string>
-            </property>
-           </widget>
-          </item>
          </layout>
         </widget>
        </item>
diff --git a/gotify_tray/gui/widgets/SettingsDialog.py b/gotify_tray/gui/widgets/SettingsDialog.py
index 3117a3b..fb28817 100644
--- a/gotify_tray/gui/widgets/SettingsDialog.py
+++ b/gotify_tray/gui/widgets/SettingsDialog.py
@@ -83,7 +83,7 @@ class SettingsDialog(QtWidgets.QDialog, Ui_Dialog):
         self.layout_fonts_message.addWidget(self.message_widget)
 
         # Advanced
-        self.cb_image_popup.setChecked(settings.value("ImagePopup/enabled", type=bool))
+        self.groupbox_image_popup.setChecked(settings.value("ImagePopup/enabled", type=bool))
         self.spin_popup_w.setValue(settings.value("ImagePopup/w", type=int))
         self.spin_popup_h.setValue(settings.value("ImagePopup/h", type=int))
 
@@ -179,7 +179,7 @@ class SettingsDialog(QtWidgets.QDialog, Ui_Dialog):
         self.pb_export.clicked.connect(self.export_callback)
         self.pb_import.clicked.connect(self.import_callback)
         self.pb_reset.clicked.connect(self.reset_callback)
-        self.cb_image_popup.stateChanged.connect(self.settings_changed_callback)
+        self.groupbox_image_popup.toggled.connect(self.settings_changed_callback)
         self.spin_popup_w.valueChanged.connect(self.settings_changed_callback)
         self.spin_popup_h.valueChanged.connect(self.settings_changed_callback)
 
@@ -212,7 +212,7 @@ class SettingsDialog(QtWidgets.QDialog, Ui_Dialog):
         )
 
         # Advanced
-        settings.setValue("ImagePopup/enabled", self.cb_image_popup.isChecked())
+        settings.setValue("ImagePopup/enabled", self.groupbox_image_popup.isChecked())
         settings.setValue("ImagePopup/w", self.spin_popup_w.value())
         settings.setValue("ImagePopup/h", self.spin_popup_h.value())