diff --git a/src/Madeleine.js b/src/Madeleine.js
index 86b74a0..1832ba0 100644
--- a/src/Madeleine.js
+++ b/src/Madeleine.js
@@ -171,6 +171,18 @@
         e.preventDefault();
       };
 
+      this.viewModeHandler = function(e) {
+        if (scope.__firstPerson) {
+          e.target.className = e.target.className.replace(" focused", "");
+          scope.__firstPerson = false;
+          scope.disableFirstPersonViewerMode();
+        } else {
+          e.target.className += " focused";
+          scope.__firstPerson = true;
+          scope.enableFirstPersonViewerMode();
+        }
+      };
+
       // Check if option values are correct
       this.adjustUserConfiguration();
       // Initialize rendering
@@ -516,6 +528,8 @@
         logo.className += "clickable pull-left madeleine-logo";
         view.className += "clickable pull-right icon-mad-view";
 
+        Lily.bind(view, "click", this.viewModeHandler);
+
         var rotator = document.createElement("div");
 
         rotator.style.cssText += "background:transparent;position:absolute;padding:15px 10px;right:0;";