diff --git a/src/components/middle/message/Location.tsx b/src/components/middle/message/Location.tsx
index 4952833f1..4d2543d2c 100644
--- a/src/components/middle/message/Location.tsx
+++ b/src/components/middle/message/Location.tsx
@@ -1,6 +1,7 @@
 import React, {
   memo, useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState,
 } from '../../../lib/teact/teact';
+import { getActions } from '../../../global';
 
 import type { FC } from '../../../lib/teact/teact';
 import type { ApiChat, ApiMessage, ApiUser } from '../../../api/types';
@@ -66,6 +67,7 @@ const Location: FC<OwnProps> = ({
   theme,
   serverTimeOffset,
 }) => {
+  const { openUrl } = getActions();
   // eslint-disable-next-line no-null/no-null
   const ref = useRef<HTMLDivElement>(null);
   // eslint-disable-next-line no-null/no-null
@@ -110,7 +112,7 @@ const Location: FC<OwnProps> = ({
 
   const handleClick = () => {
     const url = prepareMapUrl(point.lat, point.long, zoom);
-    window.open(url, '_blank', 'noopener')?.focus();
+    openUrl({ url });
   };
 
   const updateCountdown = useCallback((countdownEl: HTMLDivElement) => {
@@ -224,8 +226,7 @@ const Location: FC<OwnProps> = ({
         className="full-media map"
         src={mapBlobUrl}
         alt="Location on a map"
-        width={DEFAULT_MAP_CONFIG.width}
-        height={DEFAULT_MAP_CONFIG.height}
+        style={`width: ${DEFAULT_MAP_CONFIG.width}px; height: ${DEFAULT_MAP_CONFIG.height}px;`}
       />
     );
   }
diff --git a/src/util/map.ts b/src/util/map.ts
index de0c37ee4..1d03508d5 100644
--- a/src/util/map.ts
+++ b/src/util/map.ts
@@ -1,4 +1,4 @@
-const PROVIDER = 'http://maps.google.com/maps';
+const PROVIDER = 'https://maps.google.com/maps';
 
 // eslint-disable-next-line max-len
 // https://github.com/TelegramMessenger/Telegram-iOS/blob/2a32c871882c4e1b1ccdecd34fccd301723b30d9/submodules/LocationResources/Sources/VenueIconResources.swift#L82