diff --git a/source/Ox.UI/css/theme.css b/source/Ox.UI/css/theme.css
index 1a267d1a..fd03d06b 100644
--- a/source/Ox.UI/css/theme.css
+++ b/source/Ox.UI/css/theme.css
@@ -12,6 +12,8 @@ body.$themeClass:-ms-full-screen {
 }
 body.$themeClass:-webkit-full-screen {
     background-color: $bodyBackground;
+    width: 100%;
+    height: 100%;
 }
 .$themeClass a,
 .$themeClass .OxLink {
diff --git a/source/Ox.UI/js/Core/URL.js b/source/Ox.UI/js/Core/URL.js
index d1559c31..99c5a293 100644
--- a/source/Ox.UI/js/Core/URL.js
+++ b/source/Ox.UI/js/Core/URL.js
@@ -1006,7 +1006,7 @@ Ox.URL = function(options) {
     @*/
     that.pop = function() {
         if (self.previousURL) {
-            history.pushState && history.pushState(
+            history.pushState && !Ox.Fullscreen.getState() && history.pushState(
                 {}, self.previousTitle, self.previousURL
             );
             document.title = self.previousTitle;
@@ -1040,7 +1040,7 @@ Ox.URL = function(options) {
                 + document.location.search
                 + document.location.hash;
             if (url != self.previousURL) {
-                history.pushState && history.pushState(
+                history.pushState && !Ox.Fullscreen.getState() && history.pushState(
                     Ox.extend(state, {title: title}), '', url
                 );
                 document.title = title;
@@ -1070,7 +1070,7 @@ Ox.URL = function(options) {
             replaceState(state, title, url);
         }
         function replaceState(state, title, url) {
-            history.replaceState && history.replaceState(
+            history.replaceState && !Ox.Fullscreen.getState() && history.replaceState(
                 Ox.extend(state, {title: title}), '', url
             );
             document.title = title;