diff --git a/lib/gallery/engine.rb b/lib/gallery/engine.rb
index c6411c9..b5dc163 100644
--- a/lib/gallery/engine.rb
+++ b/lib/gallery/engine.rb
@@ -27,14 +27,14 @@ module Gallery
 
               context_link 'categories',
                 :link_path=>"admin_module_app_categories_path" ,
-                :link_arg=>{:module_app_id=>get_module_app.id},
+                :link_arg=>"{:module_app_id=>ModuleApp.find_by(:key=>'gallery').id}",
                 :priority=>3,
                 :active_for_action=>{'admin/galleries'=>'categories'},
                 :active_for_category => 'Gallery'
                                 
               context_link 'tags',
                 :link_path=>"admin_module_app_tags_path" ,
-                :link_arg=>{:module_app_id=>get_module_app.id},
+                :link_arg=>"{:module_app_id=>ModuleApp.find_by(:key=>'gallery').id}",
                 :priority=>4,
                 :active_for_action=>{'admin/galleries'=>'tags'},
                 :active_for_tag => 'Gallery'