diff --git a/gedit/gedit-view-frame.c b/gedit/gedit-view-frame.c
index 059232f0a..76e616d01 100644
--- a/gedit/gedit-view-frame.c
+++ b/gedit/gedit-view-frame.c
@@ -59,6 +59,7 @@ struct _GeditViewFrame
 	GeditView *view;
 	GeditViewCentering *view_centering;
 	GtkFrame *map_frame;
+	GtkSourceMap *map;
 
 	SearchMode search_mode;
 
@@ -1437,6 +1438,7 @@ gedit_view_frame_class_init (GeditViewFrameClass *klass)
 	gtk_widget_class_bind_template_child (widget_class, GeditViewFrame, view);
 	gtk_widget_class_bind_template_child (widget_class, GeditViewFrame, view_centering);
 	gtk_widget_class_bind_template_child (widget_class, GeditViewFrame, map_frame);
+	gtk_widget_class_bind_template_child (widget_class, GeditViewFrame, map);
 	gtk_widget_class_bind_template_child (widget_class, GeditViewFrame, revealer);
 	gtk_widget_class_bind_template_child (widget_class, GeditViewFrame, search_entry);
 	gtk_widget_class_bind_template_child (widget_class, GeditViewFrame, go_up_button);
@@ -1471,6 +1473,13 @@ gedit_view_frame_init (GeditViewFrame *frame)
 	                 "visible",
 	                 G_SETTINGS_BIND_GET | G_SETTINGS_BIND_NO_SENSITIVITY);
 
+	g_settings_bind (frame->editor_settings,
+					 GEDIT_SETTINGS_DISPLAY_OVERVIEW_MAP,
+					 frame->map,
+					 "visible",
+					 G_SETTINGS_BIND_GET | G_SETTINGS_BIND_NO_SENSITIVITY);
+
+
 	gtk_widget_override_background_color (GTK_WIDGET (frame), 0, &transparent);
 
 	doc = get_document (frame);
diff --git a/gedit/resources/ui/gedit-view-frame.ui b/gedit/resources/ui/gedit-view-frame.ui
index b61d82c3a..9806496a6 100644
--- a/gedit/resources/ui/gedit-view-frame.ui
+++ b/gedit/resources/ui/gedit-view-frame.ui
@@ -24,13 +24,13 @@
         </child>
         <child>
           <object class="GtkFrame" id="map_frame">
-            <property name="visible">True</property>
+            <property name="visible">False</property>
             <style>
               <class name="gedit-map-frame"/>
             </style>
             <child>
               <object class="GtkSourceMap" id="map">
-                <property name="visible">True</property>
+                <property name="visible">False</property>
                 <property name="view">view</property>
               </object>
             </child>
diff --git a/libgd b/libgd
--- a/libgd
+++ b/libgd
@@ -1 +1 @@
-Subproject commit 56a19ad9b056332ef07e508f1bdb6f03c6cb2590
+Subproject commit 56a19ad9b056332ef07e508f1bdb6f03c6cb2590-dirty
