diff --git a/src/Application/States/TextureMappingState.cpp b/src/Application/States/TextureMappingState.cpp
index 168f50d..c1acf20 100644
--- a/src/Application/States/TextureMappingState.cpp
+++ b/src/Application/States/TextureMappingState.cpp
@@ -159,7 +159,14 @@ void TextureMappingState::onMouseDragged(Application * app, ofMouseEventArgs & a
 		// Alter mouse event args to match canvas translation
 		args.x -= _canvasTranslate.x;
 		args.y -= _canvasTranslate.y;
-		app->getGui()->mouseDragged(args);
+		app->getGui()->getTextureEditor()->mouseDragged(args);
+		
+		if(app->getGui()->bDrag){
+			ofVec2f mousePosition = ofVec2f(args.x, args.y);
+			ofVec2f distance = mousePosition - app->getGui()->clickPosition;
+			app->getGui()->getTextureEditor()->moveTexCoords(distance);
+			app->getGui()->clickPosition = mousePosition;
+		}
 	}else{
 		ofPoint mousePosition = ofPoint(args.x, args.y);
 		ofPoint distance =  mousePosition - _clickPosition;
diff --git a/src/Surfaces/SurfaceManagerGui.cpp b/src/Surfaces/SurfaceManagerGui.cpp
index 544ee16..47be8b6 100644
--- a/src/Surfaces/SurfaceManagerGui.cpp
+++ b/src/Surfaces/SurfaceManagerGui.cpp
@@ -95,9 +95,10 @@ void SurfaceManagerGui::mousePressed(ofMouseEventArgs & args){
 
 void SurfaceManagerGui::mouseDragged(ofMouseEventArgs & args){
 	if(guiMode == GuiMode::TEXTURE_MAPPING){
-		textureEditor.mouseDragged(args);
+		//textureEditor.mouseDragged(args);
 	}
 	
+	/*
 	if(bDrag){
 		ofVec2f mousePosition = ofVec2f(args.x, args.y);
 		ofVec2f distance = mousePosition - clickPosition;
@@ -107,6 +108,7 @@ void SurfaceManagerGui::mouseDragged(ofMouseEventArgs & args){
 		}
 		clickPosition = mousePosition;
 	}
+	*/
 }
 
 void SurfaceManagerGui::setSurfaceManager(SurfaceManager * newSurfaceManager){