diff --git a/gtk/gtk_completion.c b/gtk/gtk_completion.c
index 72e165500..7ad9897d2 100644
--- a/gtk/gtk_completion.c
+++ b/gtk/gtk_completion.c
@@ -9,6 +9,7 @@
 #include "netsurf/gtk/gtk_completion.h"
 #include "netsurf/content/urldb.h"
 #include "netsurf/utils/log.h"
+#include "netsurf/desktop/options.h"
 
 GtkListStore *nsgtk_completion_list;
 
@@ -57,6 +58,7 @@ bool nsgtk_completion_udb_callback(const char *url, const struct url_data *data)
 void nsgtk_completion_update(const char *prefix)
 {
 	nsgtk_completion_empty();
-	urldb_iterate_partial(prefix, nsgtk_completion_udb_callback);
+	if (option_url_suggestion == true)
+		urldb_iterate_partial(prefix, nsgtk_completion_udb_callback);
 }
 
diff --git a/gtk/gtk_options.c b/gtk/gtk_options.c
index e187fe3cb..33e876896 100644
--- a/gtk/gtk_options.c
+++ b/gtk/gtk_options.c
@@ -111,6 +111,7 @@ void nsgtk_options_load(void) {
 	SET_ENTRY(entryHomePageURL, option_homepage_url);
 	SET_CHECK(checkHideAdverts, option_block_ads);
 	/* TODO: rest of "General" tab here */
+	SET_CHECK(checkDisplayRecentURLs, option_url_suggestion);
 	SET_CHECK(checkSendReferer, option_send_referer);
 
 	SET_ENTRY(entryProxyHost, option_http_proxy_host);
@@ -141,6 +142,7 @@ void nsgtk_options_load(void) {
 
 void nsgtk_options_save(void) {
 	GET_ENTRY(entryHomePageURL, option_homepage_url);
+	GET_CHECK(checkDisplayRecentURLs, option_url_suggestion);
 
 	GET_CHECK(checkUseCairo, option_render_cairo);
 	GET_CHECK(checkResampleImages, option_render_resample);
diff --git a/gtk/netsurf.glade b/gtk/netsurf.glade
index 02ca19d85..921bdd9f4 100644
--- a/gtk/netsurf.glade
+++ b/gtk/netsurf.glade
@@ -532,7 +532,6 @@
 			  <child>
 			    <widget class="GtkCheckButton" id="checkDisplayRecentURLs">
 			      <property name="visible">True</property>
-			      <property name="sensitive">False</property>
 			      <property name="tooltip" translatable="yes">Show a drop-down list of recent addresses when typing into the address bar.</property>
 			      <property name="can_focus">True</property>
 			      <property name="label" translatable="yes">Display recently visited URLs as you type</property>