misc/auto-completion/bash/nnn-completion.bash |  1 -
 misc/auto-completion/fish/nnn.fish            |  1 -
 misc/auto-completion/zsh/_nnn                 |  1 -
 nnn.1                                         |  5 +----
 patches/gitstatus/mainline.diff               |  4 ++--
 patches/gitstatus/namefirst.diff              |  4 ++--
 src/nnn.c                                     | 19 +++++++------------

diff --git a/misc/auto-completion/bash/nnn-completion.bash b/misc/auto-completion/bash/nnn-completion.bash
index e397bf6b7d95738eca7f9f9b9a4d1709c23be56f..bd9382ad63573a02b3c48adaf56e8a5eb379f181 100644
--- a/misc/auto-completion/bash/nnn-completion.bash
+++ b/misc/auto-completion/bash/nnn-completion.bash
@@ -42,7 +42,6 @@         -T
         -u
         -U
         -V
-        -w
         -x
         -h
     )
diff --git a/misc/auto-completion/fish/nnn.fish b/misc/auto-completion/fish/nnn.fish
index 4d4ff695c9639fea89200ae8c23858ace99f5c34..2791040805820aa8a92dc8d79b01ee567dd22495 100644
--- a/misc/auto-completion/fish/nnn.fish
+++ b/misc/auto-completion/fish/nnn.fish
@@ -41,6 +41,5 @@ complete -c nnn -s T -r -d 'a d e r s t v'
 complete -c nnn -s u    -d 'use selection (no prompt)'
 complete -c nnn -s U    -d 'show user and group'
 complete -c nnn -s V    -d 'show program version and exit'
-complete -c nnn -s w    -d 'hardware cursor mode'
 complete -c nnn -s x    -d 'notis, sel to system clipboard, xterm title'
 complete -c nnn -s h    -d 'show program help'
diff --git a/misc/auto-completion/zsh/_nnn b/misc/auto-completion/zsh/_nnn
index 72a0e8b4fa2dc8e2d420d6bdce46f1194bcae2d1..133a99e89151f5bb96873bf58f83b304b63f386c 100644
--- a/misc/auto-completion/zsh/_nnn
+++ b/misc/auto-completion/zsh/_nnn
@@ -39,7 +39,6 @@     '(-T)-T[a d e r s t v]:key'
     '(-u)-u[use selection (no prompt)]'
     '(-U)-U[show user and group]'
     '(-V)-V[show program version and exit]'
-    '(-w)-C[hardware cursor mode]'
     '(-x)-x[notis, sel to system clipboard, xterm title]'
     '(-h)-h[show program help]'
     '*:filename:_files'
diff --git a/nnn.1 b/nnn.1
index 6afe2b86361a7089450026685ff3892be54b3e21..a6fc64f435e59fce455a67c54df50d7c1012bec6 100644
--- a/nnn.1
+++ b/nnn.1
@@ -6,7 +6,7 @@ .Nm nnn
 .Nd The unorthodox terminal file manager.
 .Sh SYNOPSIS
 .Nm
-.Op Ar -aAcCdDeEfgHJKnQrRSuUVwxh
+.Op Ar -aAcCdDeEfgHJKnQrRSuUVxh
 .Op Ar -b key
 .Op Ar -F val
 .Op Ar -l val
@@ -140,9 +140,6 @@         show user and group names in status bar
 .Pp
 .Fl V
         show version and exit
-.Pp
-.Fl w
-        place hardware cursor on hovered entry
 .Pp
 .Fl x
         show notis on selection cp, mv, rm completion
diff --git a/patches/gitstatus/mainline.diff b/patches/gitstatus/mainline.diff
index c747c5e6fd8e5541ca8c44dea3b7e60f2a0e1dd2..ed1401d7faf8910b33ef693428725c3180b84012 100644
--- a/patches/gitstatus/mainline.diff
+++ b/patches/gitstatus/mainline.diff
@@ -189,8 +189,8 @@ @@ -8214,7 +8304,7 @@ int main(int argc, char *argv[])
 
  	while ((opt = (env_opts_id > 0
  		       ? env_opts[--env_opts_id]
--		       : getopt(argc, argv, "aAb:cCdDeEfF:gHiJKl:nop:P:QrRs:St:T:uUVwxh"))) != -1) {
-+		       : getopt(argc, argv, "aAb:cCdDeEfF:gGHiJKl:nop:P:QrRs:St:T:uUVwxh"))) != -1) {
+-		       : getopt(argc, argv, "aAb:cCdDeEfF:gHiJKl:nop:P:QrRs:St:T:uUVxh"))) != -1) {
++		       : getopt(argc, argv, "aAb:cCdDeEfF:gGHiJKl:nop:P:QrRs:St:T:uUVxh"))) != -1) {
  		switch (opt) {
  #ifndef NOFIFO
  		case 'a':
diff --git a/patches/gitstatus/namefirst.diff b/patches/gitstatus/namefirst.diff
index a4d0c527343481f5ba41a80ea6b99306e7fa7e24..ca99f875c35155baac4b6e1f40f227cde4411506 100644
--- a/patches/gitstatus/namefirst.diff
+++ b/patches/gitstatus/namefirst.diff
@@ -193,8 +193,8 @@ @@ -8220,7 +8310,7 @@ int main(int argc, char *argv[])
 
  	while ((opt = (env_opts_id > 0
  		       ? env_opts[--env_opts_id]
--		       : getopt(argc, argv, "aAb:cCdDeEfF:gHiJKl:nop:P:QrRs:St:T:uUVwxh"))) != -1) {
-+		       : getopt(argc, argv, "aAb:cCdDeEfF:gGHiJKl:nop:P:QrRs:St:T:uUVwxh"))) != -1) {
+-		       : getopt(argc, argv, "aAb:cCdDeEfF:gHiJKl:nop:P:QrRs:St:T:uUVxh"))) != -1) {
++		       : getopt(argc, argv, "aAb:cCdDeEfF:gGHiJKl:nop:P:QrRs:St:T:uUVxh"))) != -1) {
  		switch (opt) {
  #ifndef NOFIFO
  		case 'a':
diff --git a/src/nnn.c b/src/nnn.c
index 20415cf6088369df21ab3be8a1c248d449f416f5..8c8e5e1491d8c90bcdb1b2e8bfb58de01378ebb1 100644
--- a/src/nnn.c
+++ b/src/nnn.c
@@ -332,9 +332,9 @@ 	uint_t prefersel  : 1;  /* Prefer selection over current, if exists */
 	uint_t fileinfo   : 1;  /* Show file information on hover */
 	uint_t nonavopen  : 1;  /* Open file on right arrow or `l` */
 	uint_t autoselect : 1;  /* Auto-select dir in type-to-nav mode */
-	uint_t cursormode : 1;  /* Move hardware cursor with selection */
+	uint_t reserved2  : 1;
 	uint_t useeditor  : 1;  /* Use VISUAL to open text files */
-	uint_t reserved2  : 3;
+	uint_t reserved3  : 3;
 	uint_t regex      : 1;  /* Use regex filters */
 	uint_t x11        : 1;  /* Copy to system clipboard, show notis, xterm title */
 	uint_t timetype   : 2;  /* Time sort type (0: access, 1: change, 2: modification) */
@@ -412,9 +412,9 @@ 	0, /* prefersel */
 	0, /* fileinfo */
 	0, /* nonavopen */
 	1, /* autoselect */
-	0, /* cursormode */
-	0, /* useeditor */
 	0, /* reserved2 */
+	0, /* useeditor */
+	0, /* reserved3 */
 	0, /* regex */
 	0, /* x11 */
 	2, /* timetype (T_MOD) */
@@ -6263,9 +6263,8 @@ 		clrtoeol();
 	}
 
 	attroff(COLOR_PAIR(cfg.curctx + 1));
-
-	if (cfg.cursormode)
-		tocursor();
+	/* Plase HW cursor on current for Braille systems */
+	tocursor();
 }
 
 static inline void markhovered(void)
@@ -8074,7 +8073,6 @@ #ifndef NOUG
 		" -U      show user and group\n"
 #endif
 		" -V      show version\n"
-		" -w      place HW cursor on hovered\n"
 #ifndef NOX11
 		" -x      notis, selection sync, xterm title\n"
 #endif
@@ -8236,7 +8234,7 @@ #endif
 
 	while ((opt = (env_opts_id > 0
 		       ? env_opts[--env_opts_id]
-		       : getopt(argc, argv, "aAb:cCdDeEfF:gHiJKl:nop:P:QrRs:St:T:uUVwxh"))) != -1) {
+		       : getopt(argc, argv, "aAb:cCdDeEfF:gHiJKl:nop:P:QrRs:St:T:uUVxh"))) != -1) {
 		switch (opt) {
 #ifndef NOFIFO
 		case 'a':
@@ -8370,9 +8368,6 @@ 			break;
 		case 'V':
 			dprintf(STDOUT_FILENO, "%s\n", VERSION);
 			return EXIT_SUCCESS;
-		case 'w':
-			cfg.cursormode = 1;
-			break;
 		case 'x':
 			cfg.x11 = 1;
 			break;