diff --git a/src/SFML/Window/OSX/SFWindowController.mm b/src/SFML/Window/OSX/SFWindowController.mm
index dc0c2fe45..3511d752c 100644
--- a/src/SFML/Window/OSX/SFWindowController.mm
+++ b/src/SFML/Window/OSX/SFWindowController.mm
@@ -317,7 +317,11 @@
 ////////////////////////////////////////////////////////
 -(NSSize)size
 {
-    return [m_oglView frame].size;
+    if (*m_fullscreenMode == sf::VideoMode()) {
+        return [m_oglView frame].size;
+    } else {
+        return NSMakeSize(m_fullscreenMode->width, m_fullscreenMode->height);
+    }
 }