diff --git a/code/controller/view.php b/code/controller/view.php
index 5126eda316..3ab8e8fccc 100644
--- a/code/controller/view.php
+++ b/code/controller/view.php
@@ -83,7 +83,11 @@ public function getView()
         {
             //Make sure we have a view identifier
             if(!($this->_view instanceof ObjectIdentifier)) {
-                $this->setView($this->_view);
+                if(!$this->getRequest()->query->has('view')) {
+                    $this->setView($this->_view);
+                } else {
+                    $this->setView($this->getRequest()->query->get('view', 'cmd'));
+                }
             }
 
             //Create the view