diff --git a/data/eog-toolbar.xml b/data/eog-toolbar.xml
index 4554a90..da529cd 100644
--- a/data/eog-toolbar.xml
+++ b/data/eog-toolbar.xml
@@ -21,6 +21,8 @@
     <toolitem name="EditMoveToTrash"/>
 </available>
 <toolbar name="Toolbar">
+    <toolitem name="OpenEditor"/>
+    <separator/>
     <toolitem name="GoPrevious"/>
     <toolitem name="GoNext"/>
     <separator/>
diff --git a/data/eog.schemas.in b/data/eog.schemas.in
index 20d48ed..c444bb2 100644
--- a/data/eog.schemas.in
+++ b/data/eog.schemas.in
@@ -261,7 +261,7 @@
       <applyto>/apps/eog/ui/external_editor</applyto>
       <owner>eog</owner>
       <type>string</type>
-      <default></default>
+      <default>gimp.desktop</default>
       <locale name="C">
         <short>External program to use for editing images</short>
         <long>The desktop file name (including the ".desktop") of the application to use for
