diff --git a/src/designer/shared/layout.cpp b/src/designer/shared/layout.cpp
index 7626745b2..6abfb7a53 100644
--- a/src/designer/shared/layout.cpp
+++ b/src/designer/shared/layout.cpp
@@ -593,7 +593,7 @@ public:
 
     void setCells(const QRect &c, QWidget* w);
 
-    bool empty() const  { return m_nrows * m_ncols; }
+    bool empty() const  { return !m_nrows || !m_ncols; }
     int numRows() const { return m_nrows; }
     int numCols() const { return m_ncols; }
 
@@ -1101,7 +1101,7 @@ void GridLayout<GridLikeLayout, LayoutType, GridMode>::doLayout()
 
     GridLikeLayout *layout =  static_cast<GridLikeLayout *>(createLayout(LayoutType));
 
-    if (m_grid.empty())
+    if (!m_grid.empty())
         sort();
 
     QDesignerWidgetItemInstaller wii; // Make sure we use QDesignerWidgetItem.
@@ -1154,7 +1154,7 @@ inline QRect expandGeometry(const QRect &rect)
 template <class GridLikeLayout, int LayoutType, int GridMode>
 QWidgetList GridLayout<GridLikeLayout, LayoutType, GridMode>::buildGrid(const QWidgetList &widgetList)
 {
-    if (widgetList.empty())
+    if (widgetList.isEmpty())
         return QWidgetList();
 
     // Pixel to cell conversion: