--- a/client/js/paper-renderer.js	Thu Oct 24 19:00:50 2013 +0200
+++ b/client/js/paper-renderer.js	Fri Oct 25 01:20:25 2013 +0200
@@ -58,7 +58,7 @@
          * Called by Rkns.Renderer.NodeEditor and Rkns.Renderer.EdgeEditor */
     drawEditBox = function(_options, _coords, _path, _xmargin, _selector) {
         _selector.css({
-            width: ( _options.tooltip_width - 2* _options.tooltip_padding ),
+            width: ( _options.tooltip_width - 2* _options.tooltip_padding )
         });
         var _height = _selector.outerHeight() + 2* _options.tooltip_padding,
             _isLeft = (_coords.x < paper.view.center.x ? 1 : -1),
@@ -644,7 +644,7 @@
     if (this.options.editor_mode) {
         this.normal_buttons = [
             new EdgeEditButton(this.renderer, null),
-            new EdgeRemoveButton(this.renderer, null),
+            new EdgeRemoveButton(this.renderer, null)
         ];
         this.pending_delete_buttons = [
             new EdgeRevertButton(this.renderer, null)
@@ -1661,9 +1661,11 @@
             _this.onMouseUp(_event, false);
         },
         mousewheel: function(_event, _delta) {
-            _event.preventDefault();
-            if (_allowScroll) {
-                _this.onScroll(_event, _delta);
+            if(_renkan.options.zoom_on_scroll) {
+                _event.preventDefault();
+                if (_allowScroll) {
+                    _this.onScroll(_event, _delta);
+                }
             }
         },
         touchstart: function(_event) {