diff --git a/package-lock.json b/package-lock.json
index 0641bcd2..2fd4cbe7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -81,8 +81,7 @@
 		"@types/color-name": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
-			"integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==",
-			"dev": true
+			"integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ=="
 		},
 		"@types/debug": {
 			"version": "4.1.5",
@@ -444,6 +443,11 @@
 			"integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
 			"dev": true
 		},
+		"astral-regex": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
+			"integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ=="
+		},
 		"async": {
 			"version": "2.6.3",
 			"resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
@@ -1086,6 +1090,50 @@
 				"restore-cursor": "^2.0.0"
 			}
 		},
+		"cli-truncate": {
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz",
+			"integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==",
+			"requires": {
+				"slice-ansi": "^3.0.0",
+				"string-width": "^4.2.0"
+			},
+			"dependencies": {
+				"ansi-regex": {
+					"version": "5.0.0",
+					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+					"integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="
+				},
+				"emoji-regex": {
+					"version": "8.0.0",
+					"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+					"integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
+				},
+				"is-fullwidth-code-point": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+					"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
+				},
+				"string-width": {
+					"version": "4.2.0",
+					"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
+					"integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
+					"requires": {
+						"emoji-regex": "^8.0.0",
+						"is-fullwidth-code-point": "^3.0.0",
+						"strip-ansi": "^6.0.0"
+					}
+				},
+				"strip-ansi": {
+					"version": "6.0.0",
+					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+					"integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+					"requires": {
+						"ansi-regex": "^5.0.0"
+					}
+				}
+			}
+		},
 		"cli-width": {
 			"version": "2.2.0",
 			"resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
@@ -1945,21 +1993,30 @@
 				"extract-zip": "^1.6.7"
 			}
 		},
-		"electron-contextmenu-wrapper": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/electron-contextmenu-wrapper/-/electron-contextmenu-wrapper-4.0.1.tgz",
-			"integrity": "sha512-qSnU0b4bwaROSEpCfPkO251+dOkhWxHipv4NH9w4MRVXQPccpAiwXR0EzV0yM3ISzY7hYhfdPREttJjk4MnnMQ==",
+		"electron-context-menu": {
+			"version": "0.16.0",
+			"resolved": "https://registry.npmjs.org/electron-context-menu/-/electron-context-menu-0.16.0.tgz",
+			"integrity": "sha512-lGr1/nRlNGmU8THc0hl2dYEB5bwXJpsi7vCjjsnsNGJKPZZLY8nHY3xvtjdtwKocErvp1h8wUb19moWenzoGPw==",
 			"requires": {
-				"debug": "^4.1.1"
+				"cli-truncate": "^2.0.0",
+				"electron-dl": "^1.2.0",
+				"electron-is-dev": "^1.0.1"
+			}
+		},
+		"electron-dl": {
+			"version": "1.14.0",
+			"resolved": "https://registry.npmjs.org/electron-dl/-/electron-dl-1.14.0.tgz",
+			"integrity": "sha512-4okyei42a1mLsvLK7hLrIfd20EQzB18nIlLTwBV992aMSmTGLUEFRTmO1MfSslGNrzD8nuPuy1l/VxO8so4lig==",
+			"requires": {
+				"ext-name": "^5.0.0",
+				"pupa": "^1.0.0",
+				"unused-filename": "^1.0.0"
 			},
 			"dependencies": {
-				"debug": {
-					"version": "4.1.1",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-					"requires": {
-						"ms": "^2.1.1"
-					}
+				"pupa": {
+					"version": "1.0.0",
+					"resolved": "https://registry.npmjs.org/pupa/-/pupa-1.0.0.tgz",
+					"integrity": "sha1-mpVopa9+ZXuEYqbp1TKHQ1YM7/Y="
 				}
 			}
 		},
@@ -2188,6 +2245,23 @@
 			"integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
 			"dev": true
 		},
+		"ext-list": {
+			"version": "2.2.2",
+			"resolved": "https://registry.npmjs.org/ext-list/-/ext-list-2.2.2.tgz",
+			"integrity": "sha512-u+SQgsubraE6zItfVA0tBuCBhfU9ogSRnsvygI7wht9TS510oLkBRXBsqopeUG/GBOIQyKZO9wjTqIu/sf5zFA==",
+			"requires": {
+				"mime-db": "^1.28.0"
+			}
+		},
+		"ext-name": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/ext-name/-/ext-name-5.0.0.tgz",
+			"integrity": "sha512-yblEwXAbGv1VQDmow7s38W77hzAgJAO50ztBLMcUyUBfxv1HC+LGwtiEN+Co6LtlqT/5uwVOxsD4TNIilWhwdQ==",
+			"requires": {
+				"ext-list": "^2.0.0",
+				"sort-keys-length": "^1.0.0"
+			}
+		},
 		"extend": {
 			"version": "3.0.2",
 			"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
@@ -2900,6 +2974,11 @@
 			"integrity": "sha512-/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg==",
 			"dev": true
 		},
+		"is-plain-obj": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
+			"integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4="
+		},
 		"is-promise": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
@@ -3298,6 +3377,11 @@
 			"resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz",
 			"integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA=="
 		},
+		"mime-db": {
+			"version": "1.43.0",
+			"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz",
+			"integrity": "sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ=="
+		},
 		"mime-types": {
 			"version": "2.1.19",
 			"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.19.tgz",
@@ -3414,10 +3498,16 @@
 				}
 			}
 		},
+		"modify-filename": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/modify-filename/-/modify-filename-1.1.0.tgz",
+			"integrity": "sha1-mi3sg4Bvuy2XXyK+7IWcoms5OqE="
+		},
 		"ms": {
 			"version": "2.1.2",
 			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-			"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+			"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+			"dev": true
 		},
 		"mute-stream": {
 			"version": "0.0.7",
@@ -4322,6 +4412,45 @@
 				"string-width": "^1.0.1"
 			}
 		},
+		"slice-ansi": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz",
+			"integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==",
+			"requires": {
+				"ansi-styles": "^4.0.0",
+				"astral-regex": "^2.0.0",
+				"is-fullwidth-code-point": "^3.0.0"
+			},
+			"dependencies": {
+				"ansi-styles": {
+					"version": "4.2.1",
+					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+					"integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+					"requires": {
+						"@types/color-name": "^1.1.1",
+						"color-convert": "^2.0.1"
+					}
+				},
+				"color-convert": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+					"requires": {
+						"color-name": "~1.1.4"
+					}
+				},
+				"color-name": {
+					"version": "1.1.4",
+					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+				},
+				"is-fullwidth-code-point": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+					"integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
+				}
+			}
+		},
 		"snake-case": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/snake-case/-/snake-case-2.1.0.tgz",
@@ -4331,6 +4460,22 @@
 				"no-case": "^2.2.0"
 			}
 		},
+		"sort-keys": {
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz",
+			"integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=",
+			"requires": {
+				"is-plain-obj": "^1.0.0"
+			}
+		},
+		"sort-keys-length": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/sort-keys-length/-/sort-keys-length-1.0.1.tgz",
+			"integrity": "sha1-nLb09OnkgVWmqgZx7dM2/xR5oYg=",
+			"requires": {
+				"sort-keys": "^1.0.0"
+			}
+		},
 		"source-map": {
 			"version": "0.6.1",
 			"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -4820,6 +4965,15 @@
 			"resolved": "https://registry.npmjs.org/untildify/-/untildify-3.0.3.tgz",
 			"integrity": "sha512-iSk/J8efr8uPT/Z4eSUywnqyrQU7DSdMfdqK4iWEaUVVmcP5JcnpRqmVMwcwcnmI1ATFNgC5V90u09tBynNFKA=="
 		},
+		"unused-filename": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/unused-filename/-/unused-filename-1.0.0.tgz",
+			"integrity": "sha1-00CID3GuIRXrqhMlvvBcxmhEacY=",
+			"requires": {
+				"modify-filename": "^1.1.0",
+				"path-exists": "^3.0.0"
+			}
+		},
 		"update-notifier": {
 			"version": "4.1.0",
 			"resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-4.1.0.tgz",
diff --git a/package.json b/package.json
index 9be38025..153ec1b1 100644
--- a/package.json
+++ b/package.json
@@ -83,7 +83,7 @@
 		"auto-launch-patched": "5.0.2",
 		"electron-store": "^5.0.0",
 		"electron-is-dev": "^1.1.0",
-		"electron-contextmenu-wrapper": "^4.0.1",
+		"electron-context-menu": "^0.16.0",
 		"mime": "^2.4.4",
 		"tmp": "^0.1.0"
 	},
diff --git a/resources/js/hamsket-service-api.js b/resources/js/hamsket-service-api.js
index 4197db03..20db79e8 100644
--- a/resources/js/hamsket-service-api.js
+++ b/resources/js/hamsket-service-api.js
@@ -3,8 +3,7 @@
  */
 
 const { ipcRenderer, remote } = require('electron');
-const { MenuItem } = remote;
-const { ContextMenuBuilder, ContextMenuListener } = remote.require('electron-contextmenu-wrapper');
+const contextMenu = require('electron-context-menu');
 
 /**
  * Make the Hamsket API available via a global "hamsket" variable.
@@ -40,10 +39,31 @@ window.hamsket.clearUnreadCount = function() {
 	ipcRenderer.sendToHost('hamsket.clearUnreadCount');
 }
 
-window.hamsket.contextMenuBuilder = new ContextMenuBuilder(remote.getCurrentWebContents());
-window.hamsket.contextMenuListener = new ContextMenuListener(function(event, info) { 
-	window.hamsket.contextMenuBuilder.showPopupMenu(info);
-}, remote.getCurrentWebContents());
+contextMenu({
+	prepend: (defaultActions, params, browserWindow) => {
+		let items = [];
+		if (params.misspelledWord) {
+			const suggestions = params.dictionarySuggestions;
+			if (suggestions) {
+				suggestions.forEach((suggestion) => {
+					items.push({
+						label: suggestion,
+						visible:
+							params.isEditable,
+						click: () => {
+							browserWindow.replaceMisspelling(suggestion);
+						}
+					});
+				});
+			}
+		}
+		return items;
+	},
+	window: remote.getCurrentWebContents(),
+	showCopyImageAddress: true,
+	showSaveImage: false,
+	showSaveImageAs: true
+});
 
 
 /**