diff --git a/src/Adapter/Dropbox.php b/src/Adapter/Dropbox.php
index b600d42f1..62695416a 100644
--- a/src/Adapter/Dropbox.php
+++ b/src/Adapter/Dropbox.php
@@ -36,7 +36,7 @@ public function __construct(Client $client, $prefix = null)
     {
         $prefix = trim($prefix, '/');
         $this->client = $client;
-        $this->prefix = '/' . (empty($prefix) ? '' : $prefix . '/');
+        $this->prefix = '/' . $prefix;
     }
 
     /**
@@ -207,26 +207,22 @@ public function getTimestamp($path)
     }
 
     public function listContents($directory = '', $recursive = false)
-    {
-        return $this->retrieveListing($this->prefix($directory), $recursive);
-    }
-
-    public function retrieveListing($dir, $recursive = true)
     {
         $listing = array();
-        $directory = rtrim($dir, '/.');
-        $length = strlen($directory) + 1;
-        $location = $this->prefix($directory);
+        $directory = trim($directory, '/.');
+        $prefixLength = strlen($this->prefix);
+        $location = rtrim($this->prefix($directory), '/');
 
         if ( ! $result = $this->client->getMetadataWithChildren($location)) {
             return array();
         }
 
         foreach ($result['contents'] as $object) {
-            $listing[] = $this->normalizeObject($object, substr($object['path'], $length));
+            $path = substr($object['path'], $prefixLength);
+            $listing[] = $this->normalizeObject($object, trim($path, '/'));
 
             if ($recursive && $object['is_dir']) {
-                $listing = array_merge($listing, $this->retrieveListing($object['path']));
+                $listing = array_merge($listing, $this->listContents($path));
             }
         }
 
@@ -249,6 +245,8 @@ protected function normalizeObject($object, $path = null)
 
     protected function prefix($path)
     {
-        return $this->prefix.$path;
+        $prefix = rtrim($this->prefix, '/');
+
+        return $prefix . '/' . ltrim($path, '/');
     }
 }