diff --git a/frontend/src/components/menu/index.tsx b/frontend/src/components/menu/index.tsx
index 7d14ab2a..997c9a07 100644
--- a/frontend/src/components/menu/index.tsx
+++ b/frontend/src/components/menu/index.tsx
@@ -14,6 +14,11 @@ export interface MenuBarProps {
     editor: Editor;
 }
 
+
+interface FileHelper {
+    fileName: string;
+    reader: FileReader;
+}
 /**
  * 
  * MenuBar component
@@ -23,8 +28,8 @@ function MenuBar(props: MenuBarProps) {
 
     const theme = useTheme();
     const isDark = theme.palette.type === 'dark';
-    const projectReader = new FileReader();
-    const blockReader = new FileReader();
+    const projectReader : FileHelper = {'fileName': '', 'reader': new FileReader()};
+    const blockReader: FileHelper = {'fileName': '', 'reader': new FileReader()};
     const { editor } = props;
 
     /**
@@ -54,12 +59,13 @@ function MenuBar(props: MenuBarProps) {
      * @param _event Mouse click event. Unused
      */
     const openProject = (_event: ClickEvent) => {
+        projectReader.fileName = '';
         // Simulate click to open file selection dialog.
         document.getElementById('openProjectInput')?.click();
-        projectReader.onload = (event) => {
+        projectReader.reader.onload = (event) => {
             if (event.target?.result) {
                 // Parse file as JSON
-                editor.loadProject(JSON.parse(event.target.result.toString()))
+                editor.loadProject(JSON.parse(event.target.result.toString()), projectReader.fileName);
             }
         };
     }
@@ -114,11 +120,12 @@ function MenuBar(props: MenuBarProps) {
      * @param event File field change event.
      * @param reader Reader to open the uploaded file as text
      */
-    const onFileUpload = (event: ChangeEvent<HTMLInputElement>, reader: FileReader) => {
+    const onFileUpload = (event: ChangeEvent<HTMLInputElement>, fileHelper: FileHelper) => {
         const file = event.target.files?.length ? event.target.files[0] : null;
         event.target.value = '';
         if (file) {
-            reader.readAsText(file);
+            fileHelper.fileName = file.name;
+            fileHelper.reader.readAsText(file);
         }
     }
 
@@ -138,10 +145,11 @@ function MenuBar(props: MenuBarProps) {
      * @param _event Mouse click event. Unused
      */
     const addAsBlock = (_event: ClickEvent) => {
+        blockReader.fileName = '';
         document.getElementById('addAsBlockInput')?.click();
-        blockReader.onload = (event) => {
+        blockReader.reader.onload = (event) => {
             if (event.target?.result) {
-                editor.addAsBlock(JSON.parse(event.target.result.toString()));
+                editor.addAsBlock(JSON.parse(event.target.result.toString()), blockReader.fileName);
             }
         };
     }
diff --git a/frontend/src/core/editor.ts b/frontend/src/core/editor.ts
index 973bf50f..2c2a2c87 100644
--- a/frontend/src/core/editor.ts
+++ b/frontend/src/core/editor.ts
@@ -105,13 +105,16 @@ class Editor {
      *      "dependencies": {...}
      * }
      */
-    public loadProject(jsonModel: any) {
+    public loadProject(jsonModel: any, filename: string = '') {
         const model = new DiagramModel();
         const editor = jsonModel.editor;
         if (editor) {
             model.deserializeModel(editor, this.engine);
             this.activeModel = model;
             this.projectInfo = jsonModel.package;
+            if (this.projectInfo.name === '' && filename !== '') {
+                this.projectInfo.name = filename;
+            }
             this.engine.setModel(model)
         }
     }
@@ -385,12 +388,15 @@ class Editor {
      *      "dependencies": {...}
      * }
      */
-    public addAsBlock(jsonModel: any) {
+    public addAsBlock(jsonModel: any, fileName: string = '') {
         // Helper to convert JSON object to block.
         const block = loadPackage(jsonModel);
         // Get a default position and set it as blocks position
         // TODO: Better way would be to get an empty position dynamically or track mouse's current position.
         if (block) {
+            if (block.info.name === '' && fileName !== '') {
+                block.info.name = fileName;
+            }
             block.setPosition(...getInitialPosition())
             this.activeModel.addNode(block);
             // Once the block is added, the page has to rendered again, this is done by repainting the canvas.