diff --git a/modules/gui/src/scene_win/context_menu.cc b/modules/gui/src/scene_win/context_menu.cc
index 9be56d5129c425e430125648286c2bfbda1e9dec..a43816cd16e7658dc3b5ca552d2ee46b803695f7 100644
--- a/modules/gui/src/scene_win/context_menu.cc
+++ b/modules/gui/src/scene_win/context_menu.cc
@@ -114,11 +114,6 @@ void ContextMenu::ShowMenu(const QPoint& pos)
       connect(action, SIGNAL(triggered()), SceneSelection::Instance(), SLOT(Hide()));
     }
 
-    if((all_gfx_objects || all_custom_views) && indexes.size()==2){
-      action = menu->addAction("Rename");
-      connect(action, SIGNAL(triggered()), this, SLOT(Rename()));
-    }
-
     if(all_entity_views){
       action = menu->addAction("Show");
       connect(action, SIGNAL(triggered()), SceneSelection::Instance(), SLOT(MakeVisible()));
@@ -135,13 +130,23 @@ void ContextMenu::ShowMenu(const QPoint& pos)
       action = menu->addAction("Create Custom View");
       connect(action, SIGNAL(triggered()), this, SLOT(AddView()));
 
+    }
+
+    if(all_entity_views){
       if(all_custom_views){
         action = menu->addAction("Delete");
         connect(action, SIGNAL(triggered()), this, SLOT(DeleteView()));
       }
     }
 
-  menu->popup(pos);
+    if((all_gfx_objects || all_custom_views) && indexes.size()==2){
+      action = menu->addAction("Rename");
+      connect(action, SIGNAL(triggered()), this, SLOT(Rename()));
+    }
+
+    if(menu->actions().size()>0){
+      menu->popup(pos);
+    }
   }
 }
 
diff --git a/modules/gui/src/scene_win/label_node.cc b/modules/gui/src/scene_win/label_node.cc
index 7a9c29ce7373cdd6c191cb82e48ca4ec85c8a84b..5cf9b2d95599e76da350026866d4150ad59a606f 100644
--- a/modules/gui/src/scene_win/label_node.cc
+++ b/modules/gui/src/scene_win/label_node.cc
@@ -36,6 +36,7 @@ QVariant LabelNode::GetData(int column, int role){
       return QVariant(name_);
     } else if(role==Qt::FontRole) {
       QFont f("Helvetica");
+      f.setBold(true);
       return QVariant(f);
     }
   }