diff --git a/docs/api/popup.md b/docs/api/popup.md
index ea614022..a9f867b0 100644
--- a/docs/api/popup.md
+++ b/docs/api/popup.md
@@ -49,6 +49,12 @@
 - **Description:** If `true` content of the Popup treated as plain text
 - **See:** `setText` in [Popup](https://docs.mapbox.com/mapbox-gl-js/api/#popup#settext)
 
+### `focusAfterOpen`
+
+- **Type**: `Boolean`
+- **Description:** If `true` the popup will try to focus the first focusable element inside the popup
+- **See:** `focusAfterOpen` in [Popup](https://docs.mapbox.com/mapbox-gl-js/api/#popup#focusafteropen)
+
 ## Slots
 
 ### `default`
diff --git a/src/components/UI/Popup.js b/src/components/UI/Popup.js
index 09c2478f..28f9d7ba 100644
--- a/src/components/UI/Popup.js
+++ b/src/components/UI/Popup.js
@@ -92,6 +92,11 @@ export default {
     showed: {
       type: Boolean,
       default: false
+    },
+    
+    focusAfterOpen: {
+      type: Boolean,
+      default: true,
     }
   },