diff --git a/x11-wm/hikari/Makefile b/x11-wm/hikari/Makefile
index 56640dfca3f7..782bd3a62968 100644
--- a/x11-wm/hikari/Makefile
+++ b/x11-wm/hikari/Makefile
@@ -1,52 +1,52 @@
 PORTNAME=	hikari
 DISTVERSION=	2.3.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-wm wayland
 MASTER_SITES=	https://hikari.acmelabs.space/releases/
 
 MAINTAINER=	ashish@FreeBSD.org
 COMMENT=	Stacking Wayland compositor with tiling capabilities
 WWW=		https://hikari.acmelabs.space
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto \
 		wayland-protocols>=1.14:graphics/wayland-protocols \
 		wlroots>=0.15.0<0.16.0:x11-toolkits/wlroots
 LIB_DEPENDS=	libinput.so:x11/libinput \
 		libucl.so:textproc/libucl \
 		libwayland-server.so:graphics/wayland \
 		libwlroots.so:x11-toolkits/wlroots \
 		libxkbcommon.so:x11/libxkbcommon
 
 USES=		compiler:c11 gnome pkgconfig xorg
 USE_GNOME=	cairo pango
 USE_XORG=	pixman
 
 MAKE_ARGS+=	${WITH_DEBUG:DDEBUG=YES}
 
 OPTIONS_DEFINE=		GAMMA LAYERSHELL SCREENCOPY VIRTUALINPUT X11
 OPTIONS_DEFAULT=	GAMMA LAYERSHELL SCREENCOPY VIRTUALINPUT X11
 
 GAMMA_DESC=		Include gammacontrol protocol (required by, e.g., Redshift)
 LAYERSHELL_DESC=	Include layer_shell protocol (required by, e.g., waybar)
 SCREENCOPY_DESC=	Include screenshot protocol (required by, e.g., grim)
 VIRTUALINPUT_DESC=	needed for VNC support (requiered by e.g. wayvnc)
 
 GAMMA_MAKE_ARGS=	WITH_GAMMACONTROL=YES
 LAYERSHELL_MAKE_ARGS=	WITH_LAYERSHELL=YES
 SCREENCOPY_MAKE_ARGS=	WITH_SCREENCOPY=YES
 VIRTUALINPUT_MAKE_ARGS=	WITH_VIRTUAL_INPUT=YES
 X11_MAKE_ARGS=		WITH_XWAYLAND=YES
 
 post-install:
 .ifndef WITH_DEBUG
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/hikari
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/hikari-unlocker
 .endif
 	${MV} ${STAGEDIR}${ETCDIR}/hikari.conf \
 		${STAGEDIR}${ETCDIR}/hikari.conf.sample
 
 .include "${.CURDIR:H:H}/x11-toolkits/wlroots015/override.mk"
 .include <bsd.port.mk>
diff --git a/x11-wm/hikari/files/patch-Makefile b/x11-wm/hikari/files/patch-Makefile
index 46b33dc0c0c6..8e8ab0298900 100644
--- a/x11-wm/hikari/files/patch-Makefile
+++ b/x11-wm/hikari/files/patch-Makefile
@@ -1,11 +1,11 @@
---- Makefile.orig	2020-06-09 16:21:34 UTC
+--- Makefile.orig	2021-04-09 17:37:23 UTC
 +++ Makefile
-@@ -224,7 +224,7 @@ install: hikari hikari-unlocker share/man/man1/hikari.
+@@ -252,7 +252,7 @@ install: hikari hikari-unlocker share/man/man1/hikari.
  	sed "s,PREFIX,${PREFIX}," etc/hikari/hikari.conf > ${DESTDIR}/${ETC_PREFIX}/etc/hikari/hikari.conf
  	chmod 644 ${DESTDIR}/${ETC_PREFIX}/etc/hikari/hikari.conf
  	install -m ${PERMS} hikari ${DESTDIR}/${PREFIX}/bin
 -	install -m 4555 hikari-unlocker ${DESTDIR}/${PREFIX}/bin
 +	install -m 555 hikari-unlocker ${DESTDIR}/${PREFIX}/bin
  	install -m 644 share/man/man1/hikari.1 ${DESTDIR}/${PREFIX}/share/man/man1
  	install -m 644 share/backgrounds/hikari/hikari_wallpaper.png ${DESTDIR}/${PREFIX}/share/backgrounds/hikari/hikari_wallpaper.png
  	install -m 644 share/wayland-sessions/hikari.desktop ${DESTDIR}/${PREFIX}/share/wayland-sessions/hikari.desktop
diff --git a/x11-wm/hikari/files/patch-src_xwayland__view.c b/x11-wm/hikari/files/patch-src_xwayland__view.c
new file mode 100644
index 000000000000..cb7e8d04b77b
--- /dev/null
+++ b/x11-wm/hikari/files/patch-src_xwayland__view.c
@@ -0,0 +1,10 @@
+--- src/xwayland_view.c.orig	2023-01-15 15:39:48 UTC
++++ src/xwayland_view.c
+@@ -304,6 +304,7 @@ activate(struct hikari_view *view, bool active)
+   struct wlr_xwayland_surface *xwayland_surface = xwayland_view->surface;
+ 
+   wlr_xwayland_surface_activate(xwayland_surface, active);
++  wlr_xwayland_surface_restack(xwayland_surface, NULL, XCB_STACK_MODE_ABOVE);
+   wlr_xwayland_set_seat(hikari_server.xwayland, hikari_server.seat);
+ }
+