diff --git a/src/browsedialog.cpp b/src/browsedialog.cpp
index cfa47f2..1bf74da 100644
--- a/src/browsedialog.cpp
+++ b/src/browsedialog.cpp
@@ -167,7 +167,7 @@ void BrowseDialog::directoryUp()
 	if (p == path.size() - 1)
 		p = path.rfind("/", p - 1);
 	
-	if (p == string::npos || path.compare(0, CARD_ROOT_LEN, CARD_ROOT) != 0 || path.length() <= CARD_ROOT_LEN) {
+	if (p == string::npos || path.compare(0, 1, "/") != 0 || path.length() < 2) {
 		close = true;
 		result = false;
 	} else {
diff --git a/src/gmenu2x.cpp b/src/gmenu2x.cpp
index dc7a67d..508c162 100644
--- a/src/gmenu2x.cpp
+++ b/src/gmenu2x.cpp
@@ -77,8 +77,8 @@
 //#include <pnd_discovery.h>
 #endif
 
-const char *CARD_ROOT = "/"; //Note: Add a trailing /!
-const int CARD_ROOT_LEN = 1;
+const char *CARD_ROOT = "/card/"; //Note: Add a trailing /!
+const int CARD_ROOT_LEN = 5;
 
 using namespace std;
 using namespace fastdelegate;
diff --git a/src/selector.cpp b/src/selector.cpp
index 70cc0fd..13488fb 100644
--- a/src/selector.cpp
+++ b/src/selector.cpp
@@ -152,7 +152,7 @@ int Selector::exec(int startSelection) {
 		if ( gmenu2x->input[ACTION_X] ) {
 			if (link->getSelectorBrowser()) {
 				string::size_type p = dir.rfind("/", dir.size()-2);
-				if (p==string::npos || dir.compare(0, CARD_ROOT_LEN, CARD_ROOT) != 0 || dir.length() <= CARD_ROOT_LEN) {
+				if (p==string::npos || dir.compare(0, 1, "/") != 0 || dir.length() < 2) {
 					close = true;
 					result = false;
 				} else {