diff --git a/app/controllers/namespaces_controller.rb b/app/controllers/namespaces_controller.rb
new file mode 100644
index 0000000000000000000000000000000000000000..c59a2401cefa36351745da02591a50bfa845204e
--- /dev/null
+++ b/app/controllers/namespaces_controller.rb
@@ -0,0 +1,18 @@
+class NamespacesController < ApplicationController
+  skip_before_filter :authenticate_user!
+
+  def show
+    namespace = Namespace.find_by(path: params[:id])
+
+    unless namespace
+      return render_404
+    end
+
+    if namespace.type == "Group"
+      redirect_to group_path(namespace)
+    else
+      redirect_to user_path(namespace.owner)
+    end
+  end
+end
+
diff --git a/config/routes.rb b/config/routes.rb
index 7c2ab6bd1dd566c82a846221ac330623d2b8312f..67ff66757e6367e93bd34ebfc9ff5606ca92d304 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -315,7 +315,7 @@ Gitlab::Application.routes.draw do
     end
   end
 
-  get ':id' => "groups#show", constraints: {id: /(?:[^.]|\.(?!atom$))+/, format: /atom/}
+  get ':id' => "namespaces#show", constraints: {id: /(?:[^.]|\.(?!atom$))+/, format: /atom/}
 
   root to: "dashboard#show"
 end