--- loncom/interface/lonevaluate.pm	2014/01/17 17:10:12	1.30
+++ loncom/interface/lonevaluate.pm	2018/04/14 02:29:44	1.31
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Evaluate
 #
-# $Id: lonevaluate.pm,v 1.30 2014/01/17 17:10:12 bisitz Exp $
+# $Id: lonevaluate.pm,v 1.31 2018/04/14 02:29:44 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -76,6 +76,11 @@ sub handler {
 
     my $warning='';
 
+    my $windowname = 'loncapaclient';
+    if ($env{'request.lti.login'}) {
+        $windowname .= 'lti';
+    }
+
     if ($env{'form.submiteval'} eq 'true') {
 # ------------------------------------------------ User is submitting something
         my $complete=1;
@@ -90,7 +95,7 @@ sub handler {
 	    my $showurl=&Apache::lonenc::check_encrypt(&Apache::lonnet::clutter($feedurl));
             my $js = &Apache::lonhtmlcommon::scripttag(<<ENDJS);
     function goback() {
-        if ((window.name=='loncapaclient')) {
+        if ((window.name=='$windowname')) {
             window.location='$showurl';
         } else {
             self.close();