diff --git a/app/ui.js b/app/ui.js
index e235c0c1..d872af52 100644
--- a/app/ui.js
+++ b/app/ui.js
@@ -349,7 +349,9 @@ var UI;
                                   'onDesktopName': UI.updateDesktopName});
                 return true;
             } catch (exc) {
-                UI.showStatus('Unable to create RFB client -- ' + exc, 'error');
+                var msg = 'Unable to create RFB client -- ' + exc;
+                Util.Error(msg);
+                UI.showStatus(msg, 'error');
                 return false;
             }
         },
@@ -422,6 +424,19 @@ var UI;
                 UI.keepControlbar();
             }
 
+            // Hide input related buttons in view only mode
+            if (UI.rfb && UI.rfb.get_view_only()) {
+                document.getElementById('noVNC_keyboard_button')
+                    .classList.add('noVNC_hidden');
+                document.getElementById('noVNC_toggle_extra_keys_button')
+                    .classList.add('noVNC_hidden');
+            } else {
+                document.getElementById('noVNC_keyboard_button')
+                    .classList.remove('noVNC_hidden');
+                document.getElementById('noVNC_toggle_extra_keys_button')
+                    .classList.remove('noVNC_hidden');
+            }
+
             // State change disables viewport dragging.
             // It is enabled (toggled) by direct click on the button
             UI.setViewDrag(false);
@@ -839,7 +854,7 @@ var UI;
 
         // Disable/enable XVP button
         updateXvpButton: function(ver) {
-            if (ver >= 1) {
+            if (ver >= 1 && !UI.rfb.get_view_only()) {
                 document.getElementById('noVNC_xvp_button')
                     .classList.remove("noVNC_hidden");
             } else {
@@ -1094,18 +1109,21 @@ var UI;
                         display.set_maxWidth(screen.w);
                         display.set_maxHeight(screen.h);
 
-                        Util.Debug('Attempting requestDesktopSize(' +
-                                   screen.w + ', ' + screen.h + ')');
-
                         // Request a remote size covering the viewport
-                        UI.rfb.requestDesktopSize(screen.w, screen.h);
+                        if (UI.rfb.requestDesktopSize(screen.w, screen.h)) {
+                            Util.Debug('Requested new desktop size: ' +
+                                       screen.w + 'x' + screen.h);
+                        }
                     }, 500);
 
                 } else if (resizeMode === 'scale' || resizeMode === 'downscale') {
                     var downscaleOnly = resizeMode === 'downscale';
                     var scaleRatio = display.autoscale(screen.w, screen.h, downscaleOnly);
-                    UI.rfb.get_mouse().set_scale(scaleRatio);
-                    Util.Debug('Scaling by ' + UI.rfb.get_mouse().get_scale());
+
+                    if (!UI.rfb.get_view_only()) {
+                        UI.rfb.get_mouse().set_scale(scaleRatio);
+                        Util.Debug('Scaling by ' + UI.rfb.get_mouse().get_scale());
+                    }
                 }
             }
         },
@@ -1522,14 +1540,16 @@ var UI;
  * ------v------*/
 
         setMouseButton: function(num) {
-            if (UI.rfb) {
+            var view_only = UI.rfb.get_view_only();
+            if (UI.rfb && !view_only) {
                 UI.rfb.get_mouse().set_touchButton(num);
             }
 
             var blist = [0, 1,2,4];
             for (var b = 0; b < blist.length; b++) {
-                var button = document.getElementById('noVNC_mouse_button' + blist[b]);
-                if (blist[b] === num) {
+                var button = document.getElementById('noVNC_mouse_button' +
+                                                     blist[b]);
+                if (blist[b] === num && !view_only) {
                     button.classList.remove("noVNC_hidden");
                 } else {
                     button.classList.add("noVNC_hidden");
@@ -1538,17 +1558,17 @@ var UI;
         },
 
         displayBlur: function() {
-            if (!UI.rfb) return;
-
-            UI.rfb.get_keyboard().set_focused(false);
-            UI.rfb.get_mouse().set_focused(false);
+            if (UI.rfb && !UI.rfb.get_view_only()) {
+                UI.rfb.get_keyboard().set_focused(false);
+                UI.rfb.get_mouse().set_focused(false);
+            }
         },
 
         displayFocus: function() {
-            if (!UI.rfb) return;
-
-            UI.rfb.get_keyboard().set_focused(true);
-            UI.rfb.get_mouse().set_focused(true);
+            if (UI.rfb && !UI.rfb.get_view_only()) {
+                UI.rfb.get_keyboard().set_focused(true);
+                UI.rfb.get_mouse().set_focused(true);
+            }
         },
 
         updateDesktopName: function(rfb, name) {
diff --git a/core/rfb.js b/core/rfb.js
index ca173eae..7f8ae6d0 100644
--- a/core/rfb.js
+++ b/core/rfb.js
@@ -339,12 +339,18 @@
         // Requests a change of remote desktop size. This message is an extension
         // and may only be sent if we have received an ExtendedDesktopSize message
         requestDesktopSize: function (width, height) {
-            if (this._rfb_connection_state !== 'connected') { return; }
+            if (this._rfb_connection_state !== 'connected' ||
+                this._view_only) {
+                return;
+            }
 
             if (this._supportsSetDesktopSize) {
                 RFB.messages.setDesktopSize(this._sock, width, height,
                                             this._screen_id, this._screen_flags);
                 this._sock.flush();
+                return true;
+            } else {
+                return false;
             }
         },
 
@@ -415,8 +421,8 @@
             }
 
             if (this._display && this._display.get_context()) {
-                this._keyboard.ungrab();
-                this._mouse.ungrab();
+                if (!this._view_only) { this._keyboard.ungrab(); }
+                if (!this._view_only) { this._mouse.ungrab(); }
                 this._display.defaultCursor();
                 if (Util.get_logging() !== 'debug') {
                     // Show noVNC logo on load and when disconnected, unless in
@@ -1028,8 +1034,9 @@
             this._display.set_true_color(this._true_color);
             this._display.resize(this._fb_width, this._fb_height);
             this._onFBResize(this, this._fb_width, this._fb_height);
-            this._keyboard.grab();
-            this._mouse.grab();
+
+            if (!this._view_only) { this._keyboard.grab(); }
+            if (!this._view_only) { this._mouse.grab(); }
 
             if (this._true_color) {
                 this._fb_Bpp = 4;