diff --git a/src/desktops.c b/src/desktops.c
index 7912fad0d..a2c2c2edd 100644
--- a/src/desktops.c
+++ b/src/desktops.c
@@ -173,6 +173,7 @@ e_desktops_init_file_display(E_Desktop *desk)
 {
    E_View *v;
    E_Border *b;
+   char buf[PATH_MAX];
    
    v = e_view_new();
    v->size.w = desk->real.w;
@@ -184,20 +185,15 @@ e_desktops_init_file_display(E_Desktop *desk)
    /* uncomment this and comment out the next line for some tress testing */
    /* e_strdup(v->dir, "/dev"); */
    /* e_strdup(v->dir, e_file_home()); */
+   sprintf(buf, "%s/desktop/default", e_config_user_dir());
+   e_strdup(v->dir, buf);
+   sprintf(buf, "%s/.e_background.bg.db", v->dir);
+   v->bg = e_background_load(buf);
+   if (!v->bg)
      {
-	char buf[PATH_MAX];
-	
-	sprintf(buf, "%s/desktop/default", e_config_user_dir());
-	e_strdup(v->dir, buf);
+	sprintf(buf, "%s/default.bg.db", e_config_get("backgrounds"));
+	v->bg = e_background_load(buf);
      }
-   
-   /* FIXME: load bg here */
-   {
-      char buf[PATH_MAX];
-      
-      sprintf(buf, "%s/default.bg.db", e_config_get("backgrounds"));
-      v->bg = e_background_load(buf);
-   }
    e_view_realize(v);
 
    ecore_window_hint_set_borderless(v->win.base);
diff --git a/src/view.c b/src/view.c
index b290229f3..4a57a9778 100644
--- a/src/view.c
+++ b/src/view.c
@@ -616,9 +616,10 @@ e_view_icon_exec(E_Icon *ic)
 	v->size.h = 300;
 	v->options.back_pixmap = 0;
 	/* Load default bg then handle bg in metadata */
+	sprintf(buf, "%s/%s/.e_background.bg.db", ic->view->dir, ic->file);
+	v->bg = e_background_load(buf);
+	if (!v->bg)
 	  {
-	     char buf[PATH_MAX];
-	     
 	     sprintf(buf, "%s/view.bg.db", e_config_get("backgrounds"));
 	     v->bg = e_background_load(buf);
 	  }