diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/GradebookPage.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/GradebookPage.java
index 800b40df6df0..59607b9d6ed6 100644
--- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/GradebookPage.java
+++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/GradebookPage.java
@@ -614,7 +614,7 @@ public void renderHead(final IHeaderResponse response) {
 
 		final StringValue focusAssignmentId = getPageParameters().get(FOCUS_ASSIGNMENT_ID_PARAM);
 		final StringValue showPopupForNewItem = getPageParameters().get(NEW_GBITEM_POPOVER_PARAM);
-		if(!showPopupForNewItem.isNull() && !focusAssignmentId.isNull()){
+		if(!showPopupForNewItem.isNull() && !focusAssignmentId.isNull() && this.hasStudents){
 			getPageParameters().remove(FOCUS_ASSIGNMENT_ID_PARAM);
 			getPageParameters().remove(NEW_GBITEM_POPOVER_PARAM);
 			response.render(JavaScriptHeaderItem
diff --git a/gradebookng/tool/src/webapp/scripts/gradebook-gbgrade-table.js b/gradebookng/tool/src/webapp/scripts/gradebook-gbgrade-table.js
index afba06b87a08..e5451155167f 100644
--- a/gradebookng/tool/src/webapp/scripts/gradebook-gbgrade-table.js
+++ b/gradebookng/tool/src/webapp/scripts/gradebook-gbgrade-table.js
@@ -905,8 +905,10 @@ GbGradeTable.renderTable = function (elementId, tableData) {
     const rowIndex = range._range?.end?.row;
   
     const table = GbGradeTable.instance;
-  
-    const cellRect = table.getRows()[rowIndex].getCells()[colIndex].getElement().getBoundingClientRect();
+
+    const cell = table.getRows()[rowIndex]?.getCells()[colIndex];
+    if (!cell) return;
+    const cellRect = cell.getElement().getBoundingClientRect();
   
     const frozenColumns = table
       .getColumns()