diff --git a/kernel/av/av.go b/kernel/av/av.go
index 762b92f23..df523d7bf 100644
--- a/kernel/av/av.go
+++ b/kernel/av/av.go
@@ -205,7 +205,7 @@ const (
 func NewTableView() (ret *View) {
 	ret = &View{
 		ID:         ast.NewNodeID(),
-		Name:       getI18nName("table"),
+		Name:       GetAttributeViewI18n("table"),
 		LayoutType: LayoutTypeTable,
 		Table:      NewLayoutTable(),
 	}
@@ -213,17 +213,17 @@ func NewTableView() (ret *View) {
 }
 
 func NewTableViewWithBlockKey(blockKeyID string) (view *View, blockKey, selectKey *Key) {
-	name := getI18nName("table")
+	name := GetAttributeViewI18n("table")
 	view = &View{
 		ID:         ast.NewNodeID(),
 		Name:       name,
 		LayoutType: LayoutTypeTable,
 		Table:      NewLayoutTable(),
 	}
-	blockKey = NewKey(blockKeyID, getI18nName("key"), "", KeyTypeBlock)
+	blockKey = NewKey(blockKeyID, GetAttributeViewI18n("key"), "", KeyTypeBlock)
 	view.Table.Columns = []*ViewTableColumn{{ID: blockKeyID}}
 
-	selectKey = NewKey(ast.NewNodeID(), getI18nName("select"), "", KeyTypeSelect)
+	selectKey = NewKey(ast.NewNodeID(), GetAttributeViewI18n("select"), "", KeyTypeSelect)
 	view.Table.Columns = append(view.Table.Columns, &ViewTableColumn{ID: selectKey.ID})
 	return
 }
@@ -231,7 +231,7 @@ func NewTableViewWithBlockKey(blockKeyID string) (view *View, blockKey, selectKe
 func NewGalleryView() (ret *View) {
 	ret = &View{
 		ID:         ast.NewNodeID(),
-		Name:       getI18nName("gallery"),
+		Name:       GetAttributeViewI18n("gallery"),
 		LayoutType: LayoutTypeGallery,
 		Gallery:    NewLayoutGallery(),
 	}
@@ -601,8 +601,8 @@ func GetAttributeViewDataPath(avID string) (ret string) {
 	return
 }
 
-func getI18nName(name string) string {
-	return util.AttrViewLangs[util.Lang][name].(string)
+func GetAttributeViewI18n(key string) string {
+	return util.AttrViewLangs[util.Lang][key].(string)
 }
 
 var (
diff --git a/kernel/model/attribute_view.go b/kernel/model/attribute_view.go
index 815d13de7..ef3675a0a 100644
--- a/kernel/model/attribute_view.go
+++ b/kernel/model/attribute_view.go
@@ -70,6 +70,10 @@ func changeAttrViewLayout(operation *Operation) (err error) {
 
 	switch newLayout {
 	case av.LayoutTypeTable:
+		if view.Name == av.GetAttributeViewI18n("gallery") {
+			view.Name = av.GetAttributeViewI18n("table")
+		}
+
 		if nil != view.Table {
 			break
 		}
@@ -85,6 +89,10 @@ func changeAttrViewLayout(operation *Operation) (err error) {
 			}
 		}
 	case av.LayoutTypeGallery:
+		if view.Name == av.GetAttributeViewI18n("table") {
+			view.Name = av.GetAttributeViewI18n("gallery")
+		}
+
 		if nil != view.Gallery {
 			break
 		}