diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 8200a1bed3..45284a62c3 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -666,7 +666,7 @@ public class Workspace<T extends View & PageIndicator> extends PagedView<T>
                     .inflate(smartspaceMode.getLayoutResourceId(), firstPage, false);
         }
 
-        int cellHSpan = mLauncher.getDeviceProfile().inv.numSearchContainerColumns;
+        int cellHSpan = mLauncher.getDeviceProfile().inv.numColumns;
         CellLayoutLayoutParams lp = new CellLayoutLayoutParams(0, 0, cellHSpan, 1);
         lp.canReorder = false;
         if (!firstPage.addViewToCellLayout(
diff --git a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
index 6ea26c96e7..b5af3c028e 100644
--- a/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
+++ b/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java
@@ -593,13 +593,10 @@ public class LauncherPreviewRenderer extends ContextWrapper
         // Add first page QSB
         if (FeatureFlags.topQsbOnFirstScreenEnabled (mContext)) {
             CellLayout firstScreen = mWorkspaceScreens.get(FIRST_SCREEN_ID);
-//            View qsb = mHomeElementInflater.inflate(R.layout.qsb_preview, firstScreen, false);
-//            CellLayoutLayoutParams lp = new CellLayoutLayoutParams(
-//                    0, 0, firstScreen.getCountX(), 1);
             View qsb = mHomeElementInflater.inflate(mWorkspaceSearchContainer, firstScreen,
                     false);
             CellLayoutLayoutParams lp =
-                    new CellLayoutLayoutParams(0, 0, 1, 1);
+                    new CellLayoutLayoutParams(0, 0, mDp.inv.numColumns, 1);
             lp.canReorder = false;
             firstScreen.addViewToCellLayout(qsb, 0, R.id.search_container_workspace, lp, true);
         }