diff --git a/modules/system/system.module b/modules/system/system.module
index d4f3bc4..fa5e38d 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -293,7 +293,7 @@ function system_element_info() {
   // Top level elements.
   $types['form'] = array(
     '#method' => 'post',
-    '#action' => request_uri(),
+    '#action' => url(current_path()),
     '#theme_wrappers' => array('form'),
   );
   $types['page'] = array(