diff --git a/js/legacy/widgets/form/grid.js b/js/legacy/widgets/form/grid.js
index 9522bfe350..19e01ad4a0 100644
--- a/js/legacy/widgets/form/grid.js
+++ b/js/legacy/widgets/form/grid.js
@@ -120,9 +120,11 @@ _f.Grid.prototype.insert_column = function(doctype, fieldname, fieldtype, label,
 
 _f.Grid.prototype.reset_table_width = function() { 
 	var w = 0;
-	for(var i=0, len=this.head_row.cells.length; i<len; i++) {
-		w += cint(this.head_row.cells[i].style.width);
-	}
+	$.each(this.head_row.cells, function(i, cell) {
+		if((cell.style.display || '').toLowerCase()!='none')
+			w += cint(cell.style.width);
+	})
+	
 	this.head_tab.style.width = w + 'px';
 	this.tab.style.width = w + 'px';
 }
diff --git a/py/webnotes/model/doctype.py b/py/webnotes/model/doctype.py
index bf094a862c..9e499bbaf7 100644
--- a/py/webnotes/model/doctype.py
+++ b/py/webnotes/model/doctype.py
@@ -283,10 +283,11 @@ class _DocType:
 	def _add_code(self, doc):
 		"""add js, css code"""
 		import os
-		from webnotes.defs import modules_path
-		from webnotes.modules import scrub
+		from webnotes.modules import scrub, get_module_path
 		
-		path = os.path.join(modules_path, scrub(doc.module), 'doctype', scrub(doc.name))
+		modules_path = get_module_path(doc.module)
+		
+		path = os.path.join(modules_path, 'doctype', scrub(doc.name))
 
 		fpath = os.path.join(path, scrub(doc.name) + '.js')
 		if os.path.exists(fpath):