diff --git a/packages/decap-cms-widget-map/src/withMapControl.js b/packages/decap-cms-widget-map/src/withMapControl.js
index d91d50b280ba..305357ea50a7 100644
--- a/packages/decap-cms-widget-map/src/withMapControl.js
+++ b/packages/decap-cms-widget-map/src/withMapControl.js
@@ -45,6 +45,7 @@ export default function withMapControl({ getFormat, getMap } = {}) {
     constructor(props) {
       super(props);
       this.mapContainer = React.createRef();
+      this.resizeObserver = null;
     }
 
     componentDidMount() {
@@ -69,6 +70,18 @@ export default function withMapControl({ getFormat, getMap } = {}) {
         featuresSource.clear();
         onChange(format.writeGeometry(feature.getGeometry(), writeOptions));
       });
+
+      this.resizeObserver = new ResizeObserver(() => {
+        map.updateSize();
+      });
+
+      this.resizeObserver.observe(target);
+    }
+
+    componentWillUnmount() {
+      if (this.resizeObserver) {
+        this.resizeObserver.disconnect();
+      }
     }
 
     render() {