diff --git a/gulliver/js/maborak/core/module.drag.js b/gulliver/js/maborak/core/module.drag.js
index 2f90d9132..425cb8bca 100755
--- a/gulliver/js/maborak/core/module.drag.js
+++ b/gulliver/js/maborak/core/module.drag.js
@@ -268,7 +268,6 @@ leimnud.Package.Public({
 			{
 				if(this.options.limit===true)
 				{
-					var rng=this.parent.dom.positionRange(this.linkRef,false,true);
 					rG={
 						l:true,
 						t:true
@@ -284,6 +283,12 @@ leimnud.Package.Public({
 					{
 						tL=parseInt(this.elementStart[i].x+(cursor.x-this.cursorStart.x),10);
 						tT=parseInt(this.elementStart[i].y+(cursor.y-this.cursorStart.y),10);
+						if (tL > (screen.width - (element.clientWidth + 25))) {
+			                rG.l = false;
+			            }
+			            if (tT > (screen.height - (element.clientHeight + 200))) {
+			                rG.t = false;
+			            } 
 						if(rG.l)
 						{
 							this.parent.dom.setStyle(this.linkRef[i],{
diff --git a/workflow/engine/js/dbConnections/main.js b/workflow/engine/js/dbConnections/main.js
index 9c3c193c4..1cdf99c21 100755
--- a/workflow/engine/js/dbConnections/main.js
+++ b/workflow/engine/js/dbConnections/main.js
@@ -14,6 +14,7 @@ var oPanel;
 function newDbConnection() {
 	oPanel = new leimnud.module.panel();
 	oPanel.options = {
+		limit :true,
 	  	size	:{w:450,h:380},
 	  	position:{x:0,y:0,center:true},
 	  	title	:G_STRINGS.ID_DBS_NEW,
@@ -129,6 +130,7 @@ function editDbConnection(DBS_UID)
 
 	oPanel = new leimnud.module.panel();
 	oPanel.options = {
+		limit :true,
 		size	:{w:450,h:380},
 	  	position:{x:0,y:0,center:true},
 	  	title	:G_STRINGS.ID_DBS_EDIT,
@@ -235,6 +237,7 @@ function testDBConnection()
 		var myPanel = new leimnud.module.panel();
 		currentPopupWindow = myPanel;
 		myPanel.options = {
+			limit :true,
 			size:{w:500,h:400},
 			position:{center:true},
 			title: G_STRINGS.DBCONNECTIONS_TEST,
diff --git a/workflow/engine/js/processmap/core/processmap.js b/workflow/engine/js/processmap/core/processmap.js
index e9897e94c..8b155ea9a 100755
--- a/workflow/engine/js/processmap/core/processmap.js
+++ b/workflow/engine/js/processmap/core/processmap.js
@@ -2772,6 +2772,7 @@ function showLogCaseSchedulerList(PRO_UID)
 {
   mainPanel = new leimnud.module.panel();
   mainPanel.options = {
+      limit :true,
       size  :{w:640,h:450},
       position:{x:0,y:0,center:true},
       title :"Case Scheduler Log List",