2 files changed, 5 insertions, 6 deletions

diff --git a/src/Remember.cc b/src/Remember.cc
index 2bd691f..ff0094c 100644
--- a/src/Remember.cc
+++ b/src/Remember.cc
@@ -978,8 +978,7 @@ void Remember::rememberAttrib(WinClient &winclient, Attribute attrib) {
         app->rememberHead(win->screen().getHead(win->fbWindow()));
         break;
     case REM_DIMENSIONS:
-        //!! Note: This is odd, why dont we need to substract border width on win->width() ?
-        app->rememberDimensions(win->normalWidth(), win->normalHeight() - 2 * win->fbWindow().borderWidth());
+        app->rememberDimensions(win->normalWidth(), win->normalHeight());
         break;
     case REM_POSITION: {
         int head = win->screen().getHead(win->fbWindow());
diff --git a/src/Window.cc b/src/Window.cc
index 29acd3b..b9a454b 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -3701,25 +3701,25 @@ bool FluxboxWindow::isTransient() const {
 }
 
 int FluxboxWindow::normalX() const {
-    if (maximized & MAX_HORZ)
+    if (maximized & MAX_HORZ || fullscreen)
         return m_old_pos_x;
     return x();
 }
 
 int FluxboxWindow::normalY() const {
-    if (maximized & MAX_VERT)
+    if (maximized & MAX_VERT || fullscreen)
         return m_old_pos_y;
     return y();
 }
 
 unsigned int FluxboxWindow::normalWidth() const {
-    if (maximized & MAX_HORZ)
+    if (maximized & MAX_HORZ || fullscreen)
         return m_old_width;
     return width();
 }
 
 unsigned int FluxboxWindow::normalHeight() const {
-    if (maximized & MAX_VERT)
+    if (maximized & MAX_VERT || fullscreen)
         return m_old_height;
     if (shaded)
         return frame().normalHeight();