diff --git a/.gitignore b/.gitignore
index 33af5f9ea..fb6da523f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,7 @@ dist/
 node_modules/
 realm-object-server/
 .idea
-
+.vscode
 .DS_Store
 data/
 
diff --git a/src/ui/RealmBrowser/Content/Content.tsx b/src/ui/RealmBrowser/Content/Content.tsx
index 231d5610b..2c7a0c110 100644
--- a/src/ui/RealmBrowser/Content/Content.tsx
+++ b/src/ui/RealmBrowser/Content/Content.tsx
@@ -58,6 +58,7 @@ import { TopBar } from './TopBar';
 interface IBaseContentProps {
   contentRef: (element: HTMLElement | null) => void;
   dataVersion?: number;
+  allowCreate: boolean;
   editMode: EditMode;
   error?: Error;
   filteredSortedResults: Realm.Collection<any>;
@@ -146,6 +147,7 @@ export const Content = ({
         query={query}
         queryError={queryError}
         readOnly={props.readOnly}
+        allowCreate={props.allowCreate}
       />
 
       <div className="RealmBrowser__TableContainer">
diff --git a/src/ui/RealmBrowser/Content/CreateObjectDialog/CreateObjectDialog.tsx b/src/ui/RealmBrowser/Content/CreateObjectDialog/CreateObjectDialog.tsx
index c29827b2c..c6265a54e 100644
--- a/src/ui/RealmBrowser/Content/CreateObjectDialog/CreateObjectDialog.tsx
+++ b/src/ui/RealmBrowser/Content/CreateObjectDialog/CreateObjectDialog.tsx
@@ -42,6 +42,7 @@ export interface IOpenCreateObjectDialogProps
   getClassFocus: (className: string) => IClassFocus;
   isOpen: true;
   schema: Realm.ObjectSchema;
+  isEmbeddedType: (className: string) => boolean;
 }
 
 export type ICreateObjectDialogProps =
@@ -76,6 +77,7 @@ export const CreateObjectDialog = ({
               }
               propertyName={propertyName}
               value={values[propertyName]}
+              isEmbeddedType={props.isEmbeddedType}
             />
           ))
         : null}
diff --git a/src/ui/RealmBrowser/Content/CreateObjectDialog/PropertyRow.tsx b/src/ui/RealmBrowser/Content/CreateObjectDialog/PropertyRow.tsx
index d6e203d57..e52a57a88 100644
--- a/src/ui/RealmBrowser/Content/CreateObjectDialog/PropertyRow.tsx
+++ b/src/ui/RealmBrowser/Content/CreateObjectDialog/PropertyRow.tsx
@@ -32,6 +32,7 @@ interface IPropertyRowProps {
   property: Realm.ObjectSchemaProperty;
   propertyName: string;
   value: any;
+  isEmbeddedType: (className: string) => boolean;
 }
 
 export const PropertyRow = ({
@@ -42,6 +43,7 @@ export const PropertyRow = ({
   property,
   propertyName,
   value,
+  isEmbeddedType,
 }: IPropertyRowProps) => (
   <FormGroup className="CreateObjectDialog__PropertyRow">
     <Label
@@ -61,6 +63,7 @@ export const PropertyRow = ({
       onChange={onValueChange}
       property={property}
       value={value}
+      isEmbeddedType={isEmbeddedType}
     />
   </FormGroup>
 );
diff --git a/src/ui/RealmBrowser/Content/CreateObjectDialog/index.tsx b/src/ui/RealmBrowser/Content/CreateObjectDialog/index.tsx
index 01d9d04e3..e199804f3 100644
--- a/src/ui/RealmBrowser/Content/CreateObjectDialog/index.tsx
+++ b/src/ui/RealmBrowser/Content/CreateObjectDialog/index.tsx
@@ -46,6 +46,7 @@ interface IOpenCreateObjectDialogContainerProps {
   onCancel: () => void;
   onCreate: CreateObjectHandler;
   schema: Realm.ObjectSchema;
+  isEmbeddedType: (className: string) => boolean;
 }
 
 export interface ICreateObjectDialogContainerState {
@@ -161,6 +162,7 @@ class CreateObjectDialogContainer extends React.PureComponent<
       onCreate: this.onCreate,
       onValueChange: this.onValueChange,
       values: this.state.values,
+      isEmbeddedType: this.isEmbeddedType,
     };
     if (this.props.isOpen) {
       return {
@@ -196,6 +198,9 @@ class CreateObjectDialogContainer extends React.PureComponent<
     }
   };
 
+  protected isEmbeddedType = (className: string) =>
+    this.props.isOpen && this.props.isEmbeddedType(className);
+
   protected onValueChange = (propertyName: string, value: any) => {
     this.setState({
       values: {
diff --git a/src/ui/RealmBrowser/Content/CreateObjectDialog/types/DefaultControl.tsx b/src/ui/RealmBrowser/Content/CreateObjectDialog/types/DefaultControl.tsx
index 505733567..bdb9cf540 100644
--- a/src/ui/RealmBrowser/Content/CreateObjectDialog/types/DefaultControl.tsx
+++ b/src/ui/RealmBrowser/Content/CreateObjectDialog/types/DefaultControl.tsx
@@ -22,8 +22,11 @@ import Realm from 'realm';
 
 export interface IDefaultControlProps {
   property: Realm.ObjectSchemaProperty;
+  message?: string;
 }
 
-export const DefaultControl = ({ property }: IDefaultControlProps) => (
-  <Alert color="warning">Cannot select "{property.type}" yet</Alert>
+export const DefaultControl = ({ property, message }: IDefaultControlProps) => (
+  <Alert color="warning">
+    {message ?? `Cannot select "${property.type}" yet`}
+  </Alert>
 );
diff --git a/src/ui/RealmBrowser/Content/CreateObjectDialog/types/ListControl.tsx b/src/ui/RealmBrowser/Content/CreateObjectDialog/types/ListControl.tsx
index 24c8c707f..3a8fad0fe 100644
--- a/src/ui/RealmBrowser/Content/CreateObjectDialog/types/ListControl.tsx
+++ b/src/ui/RealmBrowser/Content/CreateObjectDialog/types/ListControl.tsx
@@ -28,7 +28,12 @@ import { ITypeControlProps, TypeControl } from './TypeControl';
 interface IItemProps
   extends Pick<
     ITypeControlProps,
-    'generateInitialValue' | 'getClassFocus' | 'onChange' | 'value' | 'property'
+    | 'generateInitialValue'
+    | 'getClassFocus'
+    | 'onChange'
+    | 'value'
+    | 'property'
+    | 'isEmbeddedType'
   > {
   onDelete: () => void;
 }
@@ -40,6 +45,7 @@ const Item = ({
   onChange,
   onDelete,
   value,
+  isEmbeddedType,
 }: IItemProps) => (
   <section className="CreateObjectDialog__ListControl__Item">
     <TypeControl
@@ -48,6 +54,7 @@ const Item = ({
       onChange={onChange}
       property={property}
       value={value}
+      isEmbeddedType={isEmbeddedType}
     >
       <InputGroupAddon addonType="append">
         <Button onClick={onDelete} size="sm">
@@ -63,7 +70,11 @@ const Item = ({
 interface IListProps
   extends Pick<
     ITypeControlProps,
-    'generateInitialValue' | 'getClassFocus' | 'onChange' | 'value'
+    | 'generateInitialValue'
+    | 'getClassFocus'
+    | 'onChange'
+    | 'value'
+    | 'isEmbeddedType'
   > {
   itemProperty: Realm.ObjectSchemaProperty;
 }
@@ -74,6 +85,7 @@ const List = ({
   itemProperty,
   onChange,
   value,
+  isEmbeddedType,
 }: IListProps) => (
   <section className="CreateObjectDialog__ListControl__Items">
     {Array.isArray(value) ? (
@@ -94,6 +106,7 @@ const List = ({
           }}
           property={itemProperty}
           value={value[index]}
+          isEmbeddedType={isEmbeddedType}
         />
       ))
     ) : (
@@ -129,6 +142,7 @@ export const ListControl = ({
   onChange,
   property,
   value,
+  isEmbeddedType,
 }: ITypeControlProps): React.ReactElement<ITypeControlProps> => {
   if (!property.objectType) {
     return <Alert color="danger">Expected an objectType</Alert>;
@@ -142,6 +156,7 @@ export const ListControl = ({
           itemProperty={itemProperty}
           onChange={onChange}
           value={value}
+          isEmbeddedType={isEmbeddedType}
         />
         <section className="CreateObjectDialog__ListControl__Buttons">
           <Button
diff --git a/src/ui/RealmBrowser/Content/CreateObjectDialog/types/ObjectControl/index.tsx b/src/ui/RealmBrowser/Content/CreateObjectDialog/types/ObjectControl/index.tsx
index c3b53ccca..fb12d52ea 100644
--- a/src/ui/RealmBrowser/Content/CreateObjectDialog/types/ObjectControl/index.tsx
+++ b/src/ui/RealmBrowser/Content/CreateObjectDialog/types/ObjectControl/index.tsx
@@ -31,12 +31,14 @@ export interface IOpenSelectObjectDialog {
   isOptional: boolean;
   onCancel: () => void;
   onSelect: (object: any) => void;
+  isEmbeddedType: (className: string) => boolean;
 }
 
 export type ISelectObjectDialog = IOpenSelectObjectDialog | { isOpen: false };
 
 export interface IObjectControlContainerProps extends IBaseControlProps {
   getClassFocus: (className: string) => IClassFocus;
+  isEmbeddedType: (className: string) => boolean;
 }
 
 export interface IObjectControlContainerState {
@@ -84,6 +86,7 @@ class ObjectControlContainer extends React.Component<
           isOptional: this.props.property.optional || false,
           onCancel: this.onCancelSelectObjectDialog,
           onSelect: this.updateObjectReference,
+          isEmbeddedType: this.props.isEmbeddedType,
         },
       });
     }
diff --git a/src/ui/RealmBrowser/Content/CreateObjectDialog/types/TypeControl.tsx b/src/ui/RealmBrowser/Content/CreateObjectDialog/types/TypeControl.tsx
index 440595372..0a38d1d9e 100644
--- a/src/ui/RealmBrowser/Content/CreateObjectDialog/types/TypeControl.tsx
+++ b/src/ui/RealmBrowser/Content/CreateObjectDialog/types/TypeControl.tsx
@@ -43,6 +43,7 @@ export interface IBaseControlProps<ValueType = any> {
 export interface ITypeControlProps extends IBaseControlProps {
   generateInitialValue: (property: Realm.ObjectSchemaProperty) => any;
   getClassFocus: (className: string) => IClassFocus;
+  isEmbeddedType: (className: string) => boolean;
 }
 
 export const TypeControl = ({
@@ -52,6 +53,7 @@ export const TypeControl = ({
   onChange,
   property,
   value,
+  isEmbeddedType,
 }: ITypeControlProps) => {
   if (property.type === 'object id') {
     return (
@@ -121,6 +123,16 @@ export const TypeControl = ({
       />
     );
   } else if (property.type === 'object') {
+    // TODO: implement
+    if (isEmbeddedType(property.objectType!)) {
+      return (
+        <DefaultControl
+          property={property}
+          message="Creation of embedded objects is not yet supported"
+        />
+      );
+    }
+
     return (
       <ObjectControl
         children={children}
@@ -128,6 +140,7 @@ export const TypeControl = ({
         onChange={onChange}
         property={property}
         value={value as object}
+        isEmbeddedType={isEmbeddedType}
       />
     );
   } else if (property.type === 'list') {
@@ -139,6 +152,7 @@ export const TypeControl = ({
         onChange={onChange}
         property={property}
         value={value as any[]}
+        isEmbeddedType={isEmbeddedType}
       />
     );
   } else {
diff --git a/src/ui/RealmBrowser/Content/SelectObjectDialog/SelectObjectDialog.tsx b/src/ui/RealmBrowser/Content/SelectObjectDialog/SelectObjectDialog.tsx
index 0e57557a7..2cf5c3a3c 100644
--- a/src/ui/RealmBrowser/Content/SelectObjectDialog/SelectObjectDialog.tsx
+++ b/src/ui/RealmBrowser/Content/SelectObjectDialog/SelectObjectDialog.tsx
@@ -45,6 +45,7 @@ interface IOpenSelectObjectDialogProps extends IBaseSelectObjectDialogProps {
     collection: Realm.Collection<any>,
   ) => void;
   multiple: boolean;
+  isEmbeddedType: (className: string) => boolean;
 }
 
 export type ISelectObjectDialogProps =
@@ -69,6 +70,7 @@ export const SelectObjectDialog = ({
       {props.isOpen ? (
         <Content
           editMode={EditMode.Disabled}
+          allowCreate={false}
           highlightMode={
             props.multiple ? HighlightMode.Multiple : HighlightMode.Single
           }
@@ -76,6 +78,7 @@ export const SelectObjectDialog = ({
           onHighlightChange={props.onHighlightChange}
           readOnly={true}
           ref={props.contentRef}
+          isEmbeddedType={props.isEmbeddedType}
         />
       ) : null}
     </ModalBody>
diff --git a/src/ui/RealmBrowser/Content/SelectObjectDialog/index.tsx b/src/ui/RealmBrowser/Content/SelectObjectDialog/index.tsx
index 2025f05cb..e220384b7 100644
--- a/src/ui/RealmBrowser/Content/SelectObjectDialog/index.tsx
+++ b/src/ui/RealmBrowser/Content/SelectObjectDialog/index.tsx
@@ -37,6 +37,7 @@ export interface IOpenSelectObjectDialogContainerProps {
   isOptional: boolean;
   multiple: boolean;
   onCancel: () => void;
+  isEmbeddedType: (className: string) => boolean;
 }
 
 export interface IOpenSelectSingleObjectDialogContainerProps
@@ -91,6 +92,7 @@ export class SelectObjectDialogContainer extends React.Component<
         contentRef: this.contentRef,
         selection: this.state.selection,
         multiple: this.props.multiple,
+        isEmbeddedType: this.props.isEmbeddedType,
       };
     } else {
       return {
diff --git a/src/ui/RealmBrowser/Content/TopBar.tsx b/src/ui/RealmBrowser/Content/TopBar.tsx
index 7589eca10..db48f7edf 100644
--- a/src/ui/RealmBrowser/Content/TopBar.tsx
+++ b/src/ui/RealmBrowser/Content/TopBar.tsx
@@ -32,6 +32,7 @@ interface ITopBarProps {
   query: string;
   queryError: Error | undefined;
   readOnly: boolean;
+  allowCreate: boolean;
 }
 
 export const TopBar = ({
@@ -42,6 +43,7 @@ export const TopBar = ({
   query,
   queryError,
   readOnly,
+  allowCreate,
 }: ITopBarProps) => {
   const className = getClassName(focus);
   return (
@@ -54,7 +56,7 @@ export const TopBar = ({
         queryError={queryError}
         placeholder="Enter a query to filter the list"
       />
-      {!readOnly ? (
+      {allowCreate && !readOnly ? (
         <Button
           size="sm"
           color="secondary"
diff --git a/src/ui/RealmBrowser/Content/index.tsx b/src/ui/RealmBrowser/Content/index.tsx
index e5f8b2ed4..eb8cae0d9 100644
--- a/src/ui/RealmBrowser/Content/index.tsx
+++ b/src/ui/RealmBrowser/Content/index.tsx
@@ -102,6 +102,7 @@ export type ISelectObjectDialog =
 
 export interface IBaseContentContainerProps {
   dataVersion?: number;
+  allowCreate: boolean;
   editMode: EditMode;
   focus: Focus;
   highlightMode: HighlightMode;
@@ -116,6 +117,7 @@ export interface IBaseContentContainerProps {
   onListFocussed?: ListFocussedHandler;
   progress?: ILoadingProgress;
   readOnly: boolean;
+  isEmbeddedType: (className: string) => boolean;
 }
 
 export interface IReadOnlyContentContainerProps
@@ -314,6 +316,7 @@ class ContentContainer extends React.Component<
         ...common,
         editMode: EditMode.Disabled,
         readOnly: true,
+        allowCreate: this.props.allowCreate,
       };
     } else {
       const { dataVersion = 0, dataVersionAtBeginning = 0 } = this.props;
@@ -322,6 +325,7 @@ class ContentContainer extends React.Component<
         changeCount: dataVersion - dataVersionAtBeginning,
         createObjectDialog: this.state.createObjectDialog,
         deleteObjectsDialog: this.state.deleteObjectsDialog,
+        allowCreate: this.props.allowCreate,
         editMode: this.props.editMode,
         getClassFocus: this.props.getClassFocus,
         inTransaction: this.props.realm.isInTransaction,
@@ -484,7 +488,8 @@ class ContentContainer extends React.Component<
         property &&
         property.type === 'object' &&
         property.name &&
-        property.objectType
+        property.objectType &&
+        !property.isEmbedded
       ) {
         this.onShowSelectObjectDialog({
           action: {
@@ -494,6 +499,7 @@ class ContentContainer extends React.Component<
           },
           className: property.objectType,
           isOptional: property.optional,
+          isEmbeddedType: this.props.isEmbeddedType,
         });
       }
     }
@@ -531,7 +537,7 @@ class ContentContainer extends React.Component<
     params,
   ) => {
     e.preventDefault();
-    const { focus, readOnly } = this.props;
+    const { allowCreate, focus, readOnly } = this.props;
     const { Menu, MenuItem } = electron.remote;
 
     const contextMenu = new Menu();
@@ -539,7 +545,12 @@ class ContentContainer extends React.Component<
     if (params) {
       const { property, rowObject } = params;
       // If we clicked a property that refers to an object
-      if (!readOnly && property && property.type === 'object') {
+      if (
+        !readOnly &&
+        property &&
+        property.type === 'object' &&
+        property.isEmbedded !== true
+      ) {
         contextMenu.append(
           new MenuItem({
             label: 'Update reference',
@@ -553,6 +564,7 @@ class ContentContainer extends React.Component<
                   },
                   className: property.objectType,
                   isOptional: property.optional,
+                  isEmbeddedType: this.props.isEmbeddedType,
                 });
               }
             },
@@ -597,7 +609,8 @@ class ContentContainer extends React.Component<
       focus &&
       focus.kind === 'list' &&
       focus.property.objectType &&
-      !isPrimitive(focus.property.objectType)
+      !isPrimitive(focus.property.objectType) &&
+      !focus.property.isEmbedded
     ) {
       const className = getClassName(focus);
       contextMenu.append(
@@ -611,6 +624,7 @@ class ContentContainer extends React.Component<
                   list: focus.results,
                 },
                 className: focus.property.objectType,
+                isEmbeddedType: this.props.isEmbeddedType,
               });
             }
           },
@@ -619,7 +633,7 @@ class ContentContainer extends React.Component<
     }
 
     // If we right-clicking on the content we can always create a new object
-    if (!readOnly && focus) {
+    if (allowCreate && !readOnly && focus) {
       const className = getClassName(focus);
       contextMenu.append(
         new MenuItem({
@@ -661,6 +675,7 @@ class ContentContainer extends React.Component<
             onCancel: this.onCancelCreateObjectDialog,
             onCreate: this.onCreateObject,
             schema,
+            isEmbeddedType: this.props.isEmbeddedType,
           },
         });
       }
@@ -853,10 +868,12 @@ class ContentContainer extends React.Component<
     className,
     isOptional = false,
     action,
+    isEmbeddedType,
   }: {
     className: string;
     isOptional?: boolean;
     action: SelectObjectAction;
+    isEmbeddedType: (className: string) => boolean;
   }) {
     if (!this.props.readOnly) {
       const focus: IClassFocus = this.props.getClassFocus(className);
@@ -871,6 +888,7 @@ class ContentContainer extends React.Component<
           onCancel: this.onCancelSelectObjectDialog,
           onSelect: this.onObjectSelect,
           propertyName: action.propertyName,
+          isEmbeddedType,
         };
         this.setState({ selectObjectDialog });
       } else {
@@ -883,6 +901,7 @@ class ContentContainer extends React.Component<
           multiple: true,
           onCancel: this.onCancelSelectObjectDialog,
           onSelect: this.onObjectSelect,
+          isEmbeddedType,
         };
         this.setState({ selectObjectDialog });
       }
diff --git a/src/ui/RealmBrowser/LeftSidebar/index.tsx b/src/ui/RealmBrowser/LeftSidebar/index.tsx
index 60bbbc017..13e565edb 100644
--- a/src/ui/RealmBrowser/LeftSidebar/index.tsx
+++ b/src/ui/RealmBrowser/LeftSidebar/index.tsx
@@ -25,8 +25,8 @@ import { Focus } from '../focus';
 
 import { LeftSidebar } from './LeftSidebar';
 
-function isSystemClassName(className: string) {
-  return className.indexOf('__') === 0;
+function isSystemClassName(cls?: Realm.ObjectSchema) {
+  return cls && (cls.name.indexOf('__') === 0 || cls.embedded === true);
 }
 
 interface ILeftSidebarContainerProps {
@@ -94,7 +94,7 @@ class LeftSidebarContainer extends React.Component<
 
   private filterClasses(classes: Realm.ObjectSchema[]) {
     if (this.state.hideSystemClasses) {
-      return classes.filter(c => !isSystemClassName(c.name));
+      return classes.filter(c => !isSystemClassName(c));
     } else {
       return classes;
     }
@@ -105,9 +105,7 @@ class LeftSidebarContainer extends React.Component<
       const shouldSelectAnotherClass = this.isFocussedOnSystemClass();
       if (showSystemClasses === false && shouldSelectAnotherClass) {
         // Focus on another class
-        const firstClass = this.props.classes.find(
-          c => !isSystemClassName(c.name),
-        );
+        const firstClass = this.props.classes.find(c => !isSystemClassName(c));
         if (firstClass) {
           this.props.onClassFocussed(firstClass.name);
         }
@@ -116,11 +114,14 @@ class LeftSidebarContainer extends React.Component<
   };
 
   private isFocussedOnSystemClass() {
-    const { focus } = this.props;
-    if (focus && focus.kind === 'class') {
-      return isSystemClassName(focus.className);
-    } else if (focus && focus.kind === 'list') {
-      return isSystemClassName(focus.parent.objectSchema().name);
+    const { focus, classes } = this.props;
+    if (focus && (focus.kind === 'class' || focus.kind === 'list')) {
+      const name =
+        focus.kind === 'class'
+          ? focus.className
+          : focus.parent.objectSchema().name;
+      const targetClass = classes.find(cls => cls.name === name);
+      return isSystemClassName(targetClass);
     } else {
       return false;
     }
diff --git a/src/ui/RealmBrowser/RealmBrowser.tsx b/src/ui/RealmBrowser/RealmBrowser.tsx
index b57c65024..df1401cc4 100644
--- a/src/ui/RealmBrowser/RealmBrowser.tsx
+++ b/src/ui/RealmBrowser/RealmBrowser.tsx
@@ -39,6 +39,7 @@ export interface IRealmBrowserProps {
   createObjectSchema?: Realm.ObjectSchema;
   dataVersion: number;
   dataVersionAtBeginning?: number;
+  allowCreate: boolean;
   editMode: EditMode;
   focus: Focus | null;
   getClassFocus: (className: string) => IClassFocus;
@@ -63,6 +64,7 @@ export interface IRealmBrowserProps {
   realm?: Realm;
   toggleAddClass: () => void;
   toggleAddClassProperty: () => void;
+  isEmbeddedType: (className: string) => boolean;
 }
 
 export const RealmBrowser = ({
@@ -71,6 +73,7 @@ export const RealmBrowser = ({
   contentRef,
   dataVersion,
   dataVersionAtBeginning,
+  allowCreate,
   editMode,
   focus,
   getClassFocus,
@@ -95,6 +98,7 @@ export const RealmBrowser = ({
   realm,
   toggleAddClass,
   toggleAddClassProperty,
+  isEmbeddedType,
 }: IRealmBrowserProps) => {
   return (
     <div className="RealmBrowser">
@@ -116,6 +120,7 @@ export const RealmBrowser = ({
           <Content
             dataVersion={dataVersion}
             dataVersionAtBeginning={dataVersionAtBeginning}
+            allowCreate={allowCreate}
             editMode={editMode}
             focus={focus}
             getClassFocus={getClassFocus}
@@ -132,6 +137,7 @@ export const RealmBrowser = ({
             readOnly={editMode === EditMode.Disabled}
             realm={realm}
             ref={contentRef}
+            isEmbeddedType={isEmbeddedType}
           />
         ) : (
           // TODO: Use the loading overlay until Realm has fully loaded
diff --git a/src/ui/RealmBrowser/index.tsx b/src/ui/RealmBrowser/index.tsx
index 851f5cce2..b4aaf9197 100644
--- a/src/ui/RealmBrowser/index.tsx
+++ b/src/ui/RealmBrowser/index.tsx
@@ -49,6 +49,7 @@ export interface IPropertyWithName extends Realm.ObjectSchemaProperty {
   name: string | null;
   readOnly: boolean;
   isPrimaryKey: boolean;
+  isEmbedded?: boolean;
 }
 
 export type EditModeChangeHandler = (editMode: EditMode) => void;
@@ -70,6 +71,7 @@ export interface IRealmBrowserState extends IRealmLoadingComponentState {
   // A number that we can use to make components update on changes to data
   dataVersion: number;
   dataVersionAtBeginning?: number;
+  allowCreate: boolean;
   editMode: EditMode;
   focus: Focus | null;
   isAddClassOpen: boolean;
@@ -88,6 +90,7 @@ class RealmBrowserContainer
   implements IMenuGenerator {
   public state: IRealmBrowserState = {
     dataVersion: 0,
+    allowCreate: false,
     editMode:
       (localStorage.getItem(EDIT_MODE_STORAGE_KEY) as EditMode) ||
       EditMode.InputBlur,
@@ -129,6 +132,7 @@ class RealmBrowserContainer
         contentRef={this.contentRef}
         dataVersion={this.state.dataVersion}
         dataVersionAtBeginning={this.state.dataVersionAtBeginning}
+        allowCreate={this.state.allowCreate}
         editMode={this.props.readOnly ? EditMode.Disabled : this.state.editMode}
         focus={this.state.focus}
         getClassFocus={this.getClassFocus}
@@ -153,6 +157,7 @@ class RealmBrowserContainer
         realm={this.realm}
         toggleAddClass={this.toggleAddClass}
         toggleAddClassProperty={this.toggleAddClassProperty}
+        isEmbeddedType={this.isEmbeddedType}
       />
     );
   }
@@ -387,11 +392,15 @@ class RealmBrowserContainer
         throw new Error('Realm was opened as read-only');
       };
     }
-    const firstSchemaName =
-      this.realm.schema.length > 0 ? this.realm.schema[0].name : undefined;
+
     this.setState({
       classes: this.realm.schema,
     });
+
+    const firstSchemaName = this.realm.schema.find(
+      c => c.name.indexOf('__') !== 0 && !c.embedded,
+    )?.name;
+
     if (firstSchemaName) {
       this.onClassFocussed(firstSchemaName);
     }
@@ -399,6 +408,21 @@ class RealmBrowserContainer
     this.performImport();
   };
 
+  private isEmbeddedType = (className: string): boolean => {
+    const { classes } = this.state;
+    return classes.find(c => c.name === className)?.embedded ?? false;
+  };
+
+  private isCreateAllowed = (focus?: Focus): boolean => {
+    if (focus && focus.kind === 'class') {
+      return !this.isEmbeddedType(focus.className);
+    } else if (focus && focus.kind === 'list') {
+      return !focus.property.isEmbedded;
+    }
+
+    return false;
+  };
+
   private onBeginTransaction = () => {
     if (this.realm && !this.realm.isInTransaction) {
       this.realm.beginTransaction();
@@ -519,7 +543,8 @@ class RealmBrowserContainer
   private changeFocusIfAllowed(focus: Focus, highligtedObject?: Realm.Object) {
     const canChangeFocus = this.canChangeFocus();
     if (canChangeFocus) {
-      this.setState({ focus }, () => {
+      const allowCreate = this.isCreateAllowed(focus);
+      this.setState({ focus, allowCreate }, () => {
         if (highligtedObject && this.contentInstance) {
           this.contentInstance.highlightObject(highligtedObject);
         }
@@ -704,9 +729,13 @@ class RealmBrowserContainer
     return Object.keys(objectSchema.properties).map(propertyName => {
       const property = objectSchema.properties[propertyName];
       if (typeof property === 'object') {
+        const isEmbedded =
+          !!property.objectType && this.isEmbeddedType(property.objectType);
+
         return {
           name: propertyName,
           readOnly: false,
+          isEmbedded,
           isPrimaryKey: objectSchema.primaryKey === propertyName,
           ...property,
         };