diff --git a/motioneye/static/js/main.js b/motioneye/static/js/main.js
index cd52ca58c..6de52cf20 100644
--- a/motioneye/static/js/main.js
+++ b/motioneye/static/js/main.js
@@ -4848,7 +4848,12 @@ function addCameraFrameUi(cameraConfig) {
 
     /* add the top buttons handlers */
     configureButton.on('click', function () {
-        doConfigureCamera(cameraId);
+        if (isSettingsOpen()) {
+            closeSettings();
+        }
+        else {
+            doConfigureCamera(cameraId);
+        }
     });
 
     picturesButton.on('click', function (cameraId) {