diff --git a/src/Gui/QSint/actionpanel/actionlabel.cpp b/src/Gui/QSint/actionpanel/actionlabel.cpp
index d7c6923048..80779b71b1 100644
--- a/src/Gui/QSint/actionpanel/actionlabel.cpp
+++ b/src/Gui/QSint/actionpanel/actionlabel.cpp
@@ -88,10 +88,8 @@ QSize ActionLabel::sizeHint() const
         s = QString::fromLatin1("XXXX");
     QFontMetrics fm = fontMetrics();
     QSize sz = fm.size(Qt::TextShowMnemonic, s);
-    if(!empty || !w)
-        w += sz.width();
-    if(!empty || !h)
-        h = qMax(h, sz.height());
+    w += sz.width();
+    h = qMax(h, sz.height());
     opt.rect.setSize(QSize(w, h)); // PM_MenuButtonIndicator depends on the height
 
     if (!icon().isNull()) {
diff --git a/src/Mod/Image/Gui/OpenGLImageBox.cpp b/src/Mod/Image/Gui/OpenGLImageBox.cpp
index 7501eac9e6..404a1a19f1 100644
--- a/src/Mod/Image/Gui/OpenGLImageBox.cpp
+++ b/src/Mod/Image/Gui/OpenGLImageBox.cpp
@@ -302,8 +302,10 @@ void GLImageBox::getDisplayedImageAreaSize(int &dx, int &dy)
             dx = 0;
             dy = 0;
         }
-        dx = ibrx - itlx + 1;
-        dy = ibry - itly + 1;
+        else {
+            dx = ibrx - itlx + 1;
+            dy = ibry - itly + 1;
+        }
     }
 }