diff --git a/lib/helper.php b/lib/helper.php
index 70b2f78862..dda5fcc5f0 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -62,8 +62,11 @@ class OC_Helper {
 			}
 		}
 
-		foreach($args as $k => $v) {
-			$urlLinkTo .= '&'.$k.'='.$v;
+		if (!empty($args)) {
+			$urlLinkTo .= '?';
+			foreach($args as $k => $v) {
+				$urlLinkTo .= '&'.$k.'='.$v;
+			}
 		}
 
 		return $urlLinkTo;