diff --git a/html/mix-manifest.json b/html/mix-manifest.json
index 96b69b865a..55afbbdabb 100644
--- a/html/mix-manifest.json
+++ b/html/mix-manifest.json
@@ -4,7 +4,7 @@
     "/js/manifest.js": "/js/manifest.js?id=3c768977c2574a34506e",
     "/js/vendor.js": "/js/vendor.js?id=8903cec9b99453318869",
     "/js/lang/de.js": "/js/lang/de.js?id=484fe7d77ae5de103cc6",
-    "/js/lang/en.js": "/js/lang/en.js?id=c35bf42975aebf3df478",
+    "/js/lang/en.js": "/js/lang/en.js?id=26d31097b2f2b72d5f2c",
     "/js/lang/fr.js": "/js/lang/fr.js?id=de8a8623522b64c3a198",
     "/js/lang/ru.js": "/js/lang/ru.js?id=d79e4e7132dc74cb16e0",
     "/js/lang/uk.js": "/js/lang/uk.js?id=a7846aab3168b1d79b47",
diff --git a/includes/html/dev-overview-data.inc.php b/includes/html/dev-overview-data.inc.php
index da1384a26c..4feffcd769 100644
--- a/includes/html/dev-overview-data.inc.php
+++ b/includes/html/dev-overview-data.inc.php
@@ -177,8 +177,11 @@ if ($device['location_id']) {
         }).on("hidden.bs.collapse", function () {
             $("#toggle-map-button").find(".fa").removeClass("fa-map-o").addClass("fa-map");
             $("#toggle-map-button span").text("View")
-        });
-    </script>
+        });';
+    if (Config::get('device_location_map_open')) {
+        echo '$("#toggle-map").collapse("show");';
+    }
+    echo '</script>
     ';
 }
 ?>
diff --git a/misc/config_definitions.json b/misc/config_definitions.json
index 31eb7fff31..f60e7efdbc 100644
--- a/misc/config_definitions.json
+++ b/misc/config_definitions.json
@@ -789,6 +789,13 @@
             "hidden": true,
             "type": "boolean"
         },
+        "device_location_map_open": {
+            "order": 0,
+            "group": "webui",
+            "section": "device",
+            "default": false,
+            "type": "boolean"
+        },
         "default_port_association_mode": {
             "default": "ifIndex",
             "type": "select",
diff --git a/resources/lang/en/settings.php b/resources/lang/en/settings.php
index 6e358e503a..0beb469b5d 100644
--- a/resources/lang/en/settings.php
+++ b/resources/lang/en/settings.php
@@ -61,6 +61,7 @@ return [
             'dashboard' => 'Dashboard Settings',
             'search' => 'Search Settings',
             'style' => 'Style',
+            'device' => 'Device Settings',
         ]
     ],
     'settings' => [
@@ -1120,6 +1121,10 @@ return [
                 'help' => 'Minimum Graph Height (default: 300)'
             ]
         ],
+        'device_location_map_open' => [
+            'description' => 'Location Map open',
+            'help' => 'Location Map is shown by default'
+        ],
         'whois' => [
             'description' => 'Path to whois'
         ]