diff --git a/voxygen/src/scene/mod.rs b/voxygen/src/scene/mod.rs
index 364c80f0b0..9513b6f602 100644
--- a/voxygen/src/scene/mod.rs
+++ b/voxygen/src/scene/mod.rs
@@ -124,7 +124,7 @@ impl Scene {
             },
             // Zoom the camera when a zoom event occurs
             Event::Zoom(delta) => {
-                self.camera.zoom_by(delta);
+                self.camera.zoom_by(-delta);
                 true
             },
             // All other events are unhandled
diff --git a/voxygen/src/window.rs b/voxygen/src/window.rs
index 81395e23d4..eee2b3dd90 100644
--- a/voxygen/src/window.rs
+++ b/voxygen/src/window.rs
@@ -113,21 +113,18 @@ impl Window {
                         },
                         _ => {}
                     },
-                    _ => {}
-                },
-                glutin::Event::DeviceEvent { event, .. } => match event {
-                    glutin::DeviceEvent::MouseMotion {
-                        delta: (dx, dy), ..
-                    } if cursor_grabbed => {
-                        events.push(Event::CursorPan(Vec2::new(dx as f32, dy as f32)))
-                    }
-                    glutin::DeviceEvent::MouseWheel {
+                    glutin::WindowEvent::MouseWheel {
                         delta: glutin::MouseScrollDelta::LineDelta(_x, y),
                         ..
-                    } if cursor_grabbed => events.push(Event::Zoom(y as f32)),
-                    _ => {}
+                    } => events.push(Event::Zoom(y as f32)),
+                    _ => {},
                 },
-                _ => {}
+                glutin::Event::DeviceEvent { event, .. } => match event {
+                    glutin::DeviceEvent::MouseMotion { delta: (dx, dy), .. } if cursor_grabbed =>
+                        events.push(Event::CursorPan(Vec2::new(dx as f32, dy as f32))),
+                    _ => {},
+                },
+                _ => {},
             }
         });
         events