diff --git a/electron/json/cors.json b/electron/json/cors.json
index 1ff8d6e94e..e56c1ff442 100644
--- a/electron/json/cors.json
+++ b/electron/json/cors.json
@@ -31,7 +31,9 @@
 		"http://localhost:*", 
 		"file://*", 
 		"https://*.youtube.com", 
-		"https://*.vimeocdn.com" 
+		"https://*.vimeocdn.com",
+		"https://*.gstatic.com",
+		"https://*.googleapis.com"
 	],
 
 	"font-src": [ 
@@ -39,7 +41,8 @@
 		"file://*", 
 		"http://localhost:*", 
 		"https://*.youtube.com", 
-		"https://*.vimeocdn.com" 
+		"https://*.vimeocdn.com",
+		"https://*.gstatic.com"
 	],
 
 	"connect-src": [ 
@@ -57,7 +60,10 @@
 		"https://*.googlevideo.com", 
 		"https://*.akamaized.net",
 		"https://*.soundcloud.com",
-		"https://*.sndcdn.com"
+		"https://*.sndcdn.com",
+		"https://*.google.com",
+		"https://*.googleapis.com",
+		"https://*.doubleclick.net"
 	],
 
 	"script-src-elem": [
@@ -69,7 +75,10 @@
 		"https://*.youtube.com",
 		"https://*.vimeocdn.com",
 		"https://*.gstatic.com",
-		"https://*.sndcdn.com"
+		"https://*.sndcdn.com",
+		"https://*.google.com",
+		"https://*.googleapis.com",
+		"https://*.doubleclick.net"
 	],
 
 	"frame-src": [
@@ -77,7 +86,8 @@
 		"http://localhost:*/embed/iframe.html",
 		"https://*.youtube.com",
 		"https://*.vimeo.com",
-		"https://w.soundcloud.com"
+		"https://w.soundcloud.com",
+		"https://*.google.com"
 	],
 
 	"worker-src": [ 
@@ -86,4 +96,4 @@
 		"blob:", 
 		"http://localhost:*" 
 	]
-}
\ No newline at end of file
+}
diff --git a/src/ts/component/block/embed.tsx b/src/ts/component/block/embed.tsx
index d00d77e4d7..125f10eb1a 100644
--- a/src/ts/component/block/embed.tsx
+++ b/src/ts/component/block/embed.tsx
@@ -459,7 +459,7 @@ const BlockEmbed = observer(class BlockEmbedIndex extends React.Component<I.Bloc
 				let text = this.text;
 
 				const sandbox = [ 'allow-scripts' ];
-				const allowSameOrigin = [ I.EmbedProcessor.Youtube, I.EmbedProcessor.Vimeo, I.EmbedProcessor.Soundcloud ];
+				const allowSameOrigin = [ I.EmbedProcessor.Youtube, I.EmbedProcessor.Vimeo, I.EmbedProcessor.Soundcloud, I.EmbedProcessor.GoogleMaps ];
 
 				if (allowSameOrigin.includes(processor)) {
 					sandbox.push('allow-same-origin');
@@ -470,7 +470,7 @@ const BlockEmbed = observer(class BlockEmbedIndex extends React.Component<I.Bloc
 					const env = this.getEnvironmentContent();
 					const data: any = { ...env, theme: commonStore.getThemeClass() };
 
-					if ([ I.EmbedProcessor.Youtube, I.EmbedProcessor.Vimeo ].includes(processor)) {
+					if ([ I.EmbedProcessor.Youtube, I.EmbedProcessor.Vimeo, I.EmbedProcessor.GoogleMaps ].includes(processor)) {
 						if (!text.match(/<iframe/)) {
 							text = UtilEmbed.getHtml(processor, UtilEmbed.getParsedUrl(text));
 						};
diff --git a/src/ts/lib/util/embed.ts b/src/ts/lib/util/embed.ts
index 04f90d4f29..006f79a46e 100644
--- a/src/ts/lib/util/embed.ts
+++ b/src/ts/lib/util/embed.ts
@@ -3,6 +3,7 @@ import { I, UtilCommon } from 'Lib';
 const DOMAINS: any  = {};
 DOMAINS[I.EmbedProcessor.Youtube] = [ 'youtube.com', 'youtu.be' ];
 DOMAINS[I.EmbedProcessor.Vimeo] = [ 'vimeo.com' ];
+DOMAINS[I.EmbedProcessor.GoogleMaps] = [ 'google.com/maps' ];
 
 class UtilEmbed {
 
@@ -50,6 +51,19 @@ class UtilEmbed {
 				url = `https://player.vimeo.com/video${a.pathname}`;
 				break;
 			};
+
+			case I.EmbedProcessor.GoogleMaps: {
+				const coords = /\@([0-9\.\,\-a-zA-Z]*)/.exec(url);
+
+				if (coords && coords[1]) {
+					const latlng = coords[1].split(',');
+					const zoom = parseFloat(latlng[2].replace('z', ''));
+					const zoomParam = 591657550.500000 / Math.pow(2, zoom);
+
+					url = `https://www.google.com/maps/embed?pb=!1m14!1m12!1m3!1d${zoomParam}!2d${latlng[1]}!3d${latlng[0]}!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!5e0!3m2!1sen!2suk!4v1486486434098`;
+				};
+				break;
+			};
 		};
 
 		return url;