diff --git a/src/bin/gui.c b/src/bin/gui.c
index 109163e..181271d 100644
--- a/src/bin/gui.c
+++ b/src/bin/gui.c
@@ -26,6 +26,7 @@ Evas_Coord option_size_height = WIDGET_DEFAULT_HEIGHT;
 Evas_Coord option_size_height_prev = WIDGET_DEFAULT_HEIGHT;
 Eina_Bool m_version = EINA_FALSE;
 Eina_Bool option_disabled = EINA_FALSE;
+Eina_Bool option_focus_highlight = EINA_FALSE;
 
 void
 gui_version_set(Eina_Bool version)
@@ -241,6 +242,27 @@ gui_option_disabled_create(Evas_Object *box)
    evas_object_show(o);
 }
 
+static void
+_focus_highlight_changed_cb(void *data EINA_UNUSED, Evas_Object *obj,
+                            void *event_info EINA_UNUSED)
+{
+   option_focus_highlight = elm_check_state_get(obj);
+}
+
+void
+gui_option_focus_highlight_create(Evas_Object *box)
+{
+   Evas_Object *o = NULL;
+   o = elm_check_add(box);
+   elm_object_text_set(o, "Focus Highlight");
+   WEIGHT(o, EVAS_HINT_EXPAND, 0.0);
+   FILL(o);
+   elm_check_state_set(o, option_focus_highlight);
+   evas_object_smart_callback_add(o, "changed", _focus_highlight_changed_cb, NULL);
+   elm_box_pack_end(box, o);
+   evas_object_show(o);
+}
+
 void
 gui_option_finger_size_create(Evas_Object *box)
 {
@@ -348,6 +370,9 @@ _option_create(Evas_Object *parent)
    // disabled set
    gui_option_disabled_create(box);
 
+   // focus highlight
+   gui_option_focus_highlight_create(box);
+
    // padding
    o = elm_box_add(box);
    EXPAND(o); FILL(o);
@@ -429,6 +454,8 @@ _option_popup_ok_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
         widget_resize(preview_obj);
      }
 
+   elm_win_focus_highlight_enabled_set(win, option_focus_highlight);
+
    evas_object_del(popup);
 }
 
@@ -640,7 +667,7 @@ static void
 _nf_prev_btn_clicked_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
                         void *event_info EINA_UNUSED)
 {
-   elm_win_focus_highlight_enabled_set(win, EINA_FALSE);
+   elm_win_focus_highlight_enabled_set(win, option_focus_highlight);
    if (elm_config_access_get())
      elm_config_access_set(EINA_FALSE);