diff --git a/src/gmenu2x.cpp b/src/gmenu2x.cpp
index 03945eb..d06168f 100644
--- a/src/gmenu2x.cpp
+++ b/src/gmenu2x.cpp
@@ -317,15 +317,8 @@ GMenu2X::GMenu2X() {
 	initMenu();
 
 	if (!fileExists(confStr["wallpaper"])) {
-		DEBUG("Searching wallpaper\n");
-
-		FileLister fl("skins/"+confStr["skin"]+"/wallpapers",false,true);
-		fl.setFilter(".png,.jpg,.jpeg,.bmp");
-		fl.browse();
-		if (fl.getFiles().size()<=0 && confStr["skin"] != "Default")
-			fl.setPath("skins/Default/wallpapers",true);
-		if (fl.getFiles().size()>0)
-			confStr["wallpaper"] = fl.getPath()+fl.getFiles()[0];
+		DEBUG("No wallpaper defined; we will take the default one.\n");
+		confStr["wallpaper"] = DEFAULT_WALLPAPER_PATH;
 	}
 
 	initBG();
diff --git a/src/gmenu2x.h b/src/gmenu2x.h
index 09dd5b1..0edfaaf 100644
--- a/src/gmenu2x.h
+++ b/src/gmenu2x.h
@@ -40,6 +40,11 @@
 #define GMENU2X_SYSTEM_DIR "/usr/share/gmenu2x"
 #endif
 
+#ifndef DEFAULT_WALLPAPER_PATH
+#define DEFAULT_WALLPAPER_PATH \
+  GMENU2X_SYSTEM_DIR "/skins/Default/wallpapers/default.png"
+#endif
+
 const int MAX_VOLUME_SCALE_FACTOR = 200;
 // Default values - going to add settings adjustment, saving, loading and such
 const int VOLUME_SCALER_MUTE = 0;