diff --git a/app/code/community/TBT/Enhancedgrid/Block/Catalog/Product/Grid.php b/app/code/community/TBT/Enhancedgrid/Block/Catalog/Product/Grid.php
index 71f1423..fd71aa2 100644
--- a/app/code/community/TBT/Enhancedgrid/Block/Catalog/Product/Grid.php
+++ b/app/code/community/TBT/Enhancedgrid/Block/Catalog/Product/Grid.php
@@ -266,12 +266,7 @@ protected function loadColumnOptions($attr_code)
     protected function _getStore()
     {
         $storeId = (int) $this->getRequest()->getParam('store', 0);
-        $store = Mage::app()->getStore($storeId);
-        if ($store->getId() != $storeId) {
-            $store = Mage::app()->getStore(0);
-        }
-
-        return $store;
+        return Mage::app()->getStore($storeId);
     }
 
     protected function _addColumnFilterToCollection($column)
@@ -667,19 +662,15 @@ protected function _prepareMassaction()
 
     public function getRowUrl($row)
     {
-        //@nelkaake -m 16/11/10: Changed to use _getStore function
-        return $this->getUrl('adminhtml/catalog_product/edit',
-            array(
-                'store' => $this->_getStore(),
-                'id' => $row->getId(),
-            ));
+        return $this->getUrl('*/*/edit', array(
+            'store'=>$this->getRequest()->getParam('store'),
+            'id'=>$row->getId())
+        );
     }
 
     public function getGridUrl()
     {
-        return $this->getUrl('adminhtml/*/grid', array(
-            '_current' => true,
-        ));
+        return $this->getUrl('*/*/grid', array('_current'=>true));
     }
 
     protected function getMADivider($dividerHeading = '-------')