diff --git a/laravel/form.php b/laravel/form.php
index 5c21bfaf..b9a140e1 100644
--- a/laravel/form.php
+++ b/laravel/form.php
@@ -87,7 +87,9 @@ class Form {
 	 */
 	protected static function action($action, $https)
 	{
-		return HTML::entities(URL::to(((is_null($action)) ? Request::uri() : $action), $https));
+		$uri = (is_null($action)) ? URI::current() : $action;
+
+		return HTML::entities(URL::to($uri, $https));
 	}
 
 	/**
@@ -540,4 +542,4 @@ class Form {
 		}
 	}
 
-}
+}
\ No newline at end of file