diff --git a/backend/internal/api/workspace_handlers.go b/backend/internal/api/workspace_handlers.go
index 3677777..38e3125 100644
--- a/backend/internal/api/workspace_handlers.go
+++ b/backend/internal/api/workspace_handlers.go
@@ -54,6 +54,22 @@ func CreateWorkspace(db *db.DB) http.HandlerFunc {
 			return
 		}
 
+		defaultSettings := &models.WorkspaceSettings{
+			WorkspaceID: workspace.ID,
+			Settings: models.UserSettings{
+				Theme:                "light",
+				AutoSave:             false,
+				GitEnabled:           false,
+				GitAutoCommit:        false,
+				GitCommitMsgTemplate: "${action} ${filename}",
+			},
+		}
+
+		if err := db.SaveWorkspaceSettings(defaultSettings); err != nil {
+			http.Error(w, "Failed to initialize workspace settings", http.StatusInternalServerError)
+			return
+		}
+
 		respondJSON(w, workspace)
 	}
 }
diff --git a/backend/internal/db/workspace.go b/backend/internal/db/workspace.go
index 98cf07c..9d02cae 100644
--- a/backend/internal/db/workspace.go
+++ b/backend/internal/db/workspace.go
@@ -5,7 +5,7 @@ import (
 )
 
 func (db *DB) CreateWorkspace(workspace *models.Workspace) error {
-	result, err := db.Exec("INSERT INTO workspaces (user_id, name) VALUES (?, ?, ?)",
+	result, err := db.Exec("INSERT INTO workspaces (user_id, name) VALUES (?, ?)",
 		workspace.UserID, workspace.Name)
 	if err != nil {
 		return err
diff --git a/frontend/src/contexts/WorkspaceContext.js b/frontend/src/contexts/WorkspaceContext.js
index 0006a77..a0f5383 100644
--- a/frontend/src/contexts/WorkspaceContext.js
+++ b/frontend/src/contexts/WorkspaceContext.js
@@ -12,6 +12,7 @@ import {
   fetchWorkspaceSettings,
   saveWorkspaceSettings,
   getWorkspace,
+  updateLastWorkspace,
 } from '../services/api';
 import { DEFAULT_SETTINGS } from '../utils/constants';
 
@@ -61,8 +62,10 @@ export const WorkspaceProvider = ({ children }) => {
 
   const switchWorkspace = useCallback(async (workspaceId) => {
     try {
+      console.log(workspaceId);
       setLoading(true);
       await updateLastWorkspace(workspaceId);
+      console.log('Hello');
       await loadWorkspaceData(workspaceId);
       notifications.show({
         title: 'Success',