diff --git a/src/FbTk/Theme.cc b/src/FbTk/Theme.cc
index c2522754..a62c8a6b 100644
--- a/src/FbTk/Theme.cc
+++ b/src/FbTk/Theme.cc
@@ -115,12 +115,13 @@ bool ThemeManager::unregisterTheme(Theme &tm) {
 
 bool ThemeManager::load(const string &filename,
                         const string &overlay_filename, int screen_num) {
+    
     string location = FbTk::StringUtil::expandFilename(filename);
     StringUtil::removeTrailingWhitespace(location);
     StringUtil::removeFirstWhitespace(location);
     string prefix = "";
 
-    if (FileUtil::isDirectory(filename.c_str())) {
+    if (FileUtil::isDirectory(location.c_str())) {
         prefix = location;
 
         location.append("/theme.cfg");