diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 1f96138..6f461b4 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -3,5 +3,5 @@ AUX gtk+-typeahead.patch 3327 SHA256 dddb361554d1d6b09b8c53777fec8da2c04d37a1333
 AUX gtkrc 627 SHA256 22e4197e5976ed623233399049082383033b613176d77126d246a1f6cb747294 SHA512 9fb246b8e483cfb5f8d3666397d50547ad0cdaa8bdf5737e67e14dd100952438ac93396f0d752306c02aa4934453a43eb360093c4e323e99bbe0706c40171dc4 WHIRLPOOL fdb1c72ce448e867dd8d591455103fb7790919e1d7e77d6c5aa46e9a3fbc590ad6a189c50d2bc958896471a31b975940960307dc80a2d88416b77fca581b4dfb
 AUX settings.ini 96 SHA256 a42c86c26b5bfa0da806961e28cdff21da6e2f7c35febf67c67d7f2667658163 SHA512 76eff45e3413ed7b2fb6bb557c363cd6d8a65ae505709cf5ce26d579470e38968d51e72615779f47fac2994937a3c64ac4143c6cbd2cf5a2db23a01bcd9b6418 WHIRLPOOL 64a2c11ef1a6eda0bca40555a182023229202bcf15d527e6da8c52703be2fca26629b78ed677522eb626de7b7f456a7c37ab7fc3fe41907f1a46d770edb1fd67
 DIST gtk+-3.22.19.tar.xz 18841024 SHA256 9883d3ca5244f9b3168ce660e87d52900e141d0f7147dea0640bdd6fe8e5166c SHA512 c83198794433ee6eb29f8740d59bd7056cd36808b4bff1a99563ab1a1742e6635dab4f2a8be33317f74d3b336f0d1adc28dd91410da056b50a08c215f184dce2 WHIRLPOOL 27b7921512951cdc3735e7c96fee5b7f930542c46d61a389bea2a3484ff4d9fbc8fc6a91b0ce4fb3fcf58f432b8939a77f829db2e27a9e7a690fb1ae6d600b4a
-EBUILD gtk+-3.22.19-r1.ebuild 6843 SHA256 3bcc6a8a15441017b9e65e794abf21053fa6f9bbdc28e1245c9dab4fffd9817c SHA512 8183c6847c9d952a8749e9e9390ac84fc7707f888ee9d465ca6a7bb1584d2c96912e4189607e8aae46da5d04cc5f607fcb35974809dffdac40f49d60e951acfe WHIRLPOOL 35c0004cd639ea6622bf570f3dab50be909eb0b56fd5861ef1c2628b4cbb715bd465f8e63bd83876eeaf9741acea59f9628d8cf6c0318e14a1b13b382dea6520
-MISC metadata.xml 834 SHA256 75a6d7ecf4310e93b751cca313bc8775adb334f2cb9f43a324827c5d3138ca91 SHA512 e1ec73c4c9433c70c17fc3826193d8289200e347a32d67a824b803213ac281f21364a08c21c819c3e93a2d8582d90bef48766f22ba9ed495099b3eb6071aa561 WHIRLPOOL c8a6c88cc770afce3839f8bf0b8c41a508d2a2aeaa7b49bcda6873ddd728a2a977a215402cfa8cf1daf9cf1d37ba1a7e334f61cf73eb9a024b8cd00bc25c4cef
+EBUILD gtk+-3.22.19-r1.ebuild 6939 SHA256 a2e394cc471096131fb05c7abcd5e5060039c8eb619166adb3a935998775e859 SHA512 6b3bc8d7444ad698a5b0a6e8efe277275f76ca107e5d3eea99d42a8304e8af7e71c8d9f5609b907a765950f67933e6ce198041a50d80011cb3fb4198a65a9746 WHIRLPOOL 3acbf2fb8da4c7db29cf0912997a7a52a6777c17114c37e0b49b6193ee0efe005c3130c8171c3c6da2902956f1e668c96d5d03ca560d0e153a2fb835ba8ccb92
+MISC metadata.xml 890 SHA256 6c2d4f714168d9b8e40469b94244f85e507ee75192f24ba51a33ef66c05e822f SHA512 0a5e0d5ecb0a7c20ee5a41720b88611c986aae4f5f7a35615efecd30dd6d99bf0a67041ff8c11b49ad90167d61b9531c5ca6d6a841acb4db6ebd1cc5aa25d7eb WHIRLPOOL fb5f0ff8bade0f77693afbff3d2aea7974a9e713ef884e77b288c6b3aec879e4b218b0ebcaca75eb6738dde0d45423b8eb419fd1df486bb3a56e2ef785a10aae
diff --git a/x11-libs/gtk+/gtk+-3.22.19-r1.ebuild b/x11-libs/gtk+/gtk+-3.22.19-r1.ebuild
index 944201d..4c463fe 100644
--- a/x11-libs/gtk+/gtk+-3.22.19-r1.ebuild
+++ b/x11-libs/gtk+/gtk+-3.22.19-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="3"
-IUSE="aqua broadway cloudprint colord cups examples +introspection test vim-syntax wayland +X xinerama"
+IUSE="aqua broadway cloudprint colord cups examples +introspection test typeahead vim-syntax wayland +X xinerama"
 REQUIRED_USE="
 	|| ( aqua wayland X )
 	xinerama? ( X )
@@ -126,8 +126,10 @@ src_prepare() {
 	# gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache
 	eapply "${FILESDIR}"/${PN}-3.22.19-update-icon-cache.patch
 
-	# Allow
-	eapply "${FILESDIR}"/${PN}-typeahead.patch
+	# Allow typehead (pressing a letter won't automatically search)
+	if use typeahead ; then
+		eapply "${FILESDIR}"/${PN}-typeahead.patch
+	fi
 
 	eautoreconf
 	gnome2_src_prepare
diff --git a/x11-libs/gtk+/metadata.xml b/x11-libs/gtk+/metadata.xml
index 7fe0a6b..7ec6b06 100644
--- a/x11-libs/gtk+/metadata.xml
+++ b/x11-libs/gtk+/metadata.xml
@@ -16,6 +16,7 @@
 		<flag name="cloudprint">Enable printing via Google Cloud Print.</flag>
 		<flag name="colord">Use <pkg>x11-misc/colord</pkg> for color management
 			in printing</flag>
+		<flag name="typeahead">Enable typeahead patch.</flag>
 	</use>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:gtk:gtk%2B</remote-id>