diff --git a/bookshop/srv/admin-service.cds b/bookshop/srv/admin-service.cds
index ea9b0731..abbdeaf5 100644
--- a/bookshop/srv/admin-service.cds
+++ b/bookshop/srv/admin-service.cds
@@ -3,3 +3,7 @@ service AdminService @(requires:'admin') {
   entity Books as projection on my.Books;
   entity Authors as projection on my.Authors;
 }
+
+//Since ID is computed, we can hide the popup for ID on Create
+annotate AdminService.Books with   { ID @Core.Computed; }
+annotate AdminService.Authors with { ID @Core.Computed; }
\ No newline at end of file
diff --git a/fiori/app/admin/fiori-service.cds b/fiori/app/admin/fiori-service.cds
index 972c1232..fc1987cb 100644
--- a/fiori/app/admin/fiori-service.cds
+++ b/fiori/app/admin/fiori-service.cds
@@ -85,7 +85,8 @@ annotate AdminService.Books.texts with @(
 
 // Add Value Help for Locales
 annotate AdminService.Books.texts {
-	locale @ValueList:{entity:'Languages',type:#fixed}
+	locale @ValueList:{entity:'Languages'};
+	locale @Common.ValueListWithFixedValues:true; //show as drop down, not a dialog
 }
 // In addition we need to expose Languages through AdminService as a target for ValueList
 using { sap } from '@sap/cds/common';